diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
| commit | bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41 (patch) | |
| tree | 8d170862fabd03b266f6960f1dd615a987872a62 /content/shell | |
| parent | b596068321d72606cd8e65204380e2b23b9169cc (diff) | |
| download | chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.zip chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.gz chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.bz2 | |
Move wm/public into wm target
TBR=sky@chromium.org
http://crbug/com/308710
Review URL: https://codereview.chromium.org/209383003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/DEPS | 1 | ||||
| -rw-r--r-- | content/shell/browser/shell_platform_data_aura.cc | 2 | ||||
| -rw-r--r-- | content/shell/browser/shell_views.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/content/shell/DEPS b/content/shell/DEPS index 1d7524c..e25d813 100644 --- a/content/shell/DEPS +++ b/content/shell/DEPS @@ -19,6 +19,7 @@ include_rules = [ # The content_shell for aura must work with the views and aura "+ui/aura", "+ui/views", + "+ui/wm", "+components/breakpad", ] diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc index fdbf634..afb44bb 100644 --- a/content/shell/browser/shell_platform_data_aura.cc +++ b/content/shell/browser/shell_platform_data_aura.cc @@ -6,7 +6,6 @@ #include "content/shell/browser/shell.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/default_activation_client.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" @@ -18,6 +17,7 @@ #include "ui/base/ime/input_method_delegate.h" #include "ui/base/ime/input_method_factory.h" #include "ui/gfx/screen.h" +#include "ui/wm/core/default_activation_client.h" namespace content { diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc index 5789cd6..fec16d7 100644 --- a/content/shell/browser/shell_views.cc +++ b/content/shell/browser/shell_views.cc @@ -487,7 +487,7 @@ void Shell::PlatformCreateWindow(int width, int height) { #if defined(OS_CHROMEOS) window_widget_ = views::Widget::CreateWindowWithContextAndBounds( new ShellWindowDelegateView(this), - wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()), + wm_test_helper_->root_window(), gfx::Rect(0, 0, width, height)); #else window_widget_ = new views::Widget; |