summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 01:29:13 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 01:29:13 +0000
commit7dd11dba06ec642ef2d6e7dfb2a9d1f807c67380 (patch)
treeec974bc4bfe06c382b7e32d4ca9619ec5b423b48 /ash
parentfbc1c270c4775465d830d955c3c976c93d7ad582 (diff)
downloadchromium_src-7dd11dba06ec642ef2d6e7dfb2a9d1f807c67380.zip
chromium_src-7dd11dba06ec642ef2d6e7dfb2a9d1f807c67380.tar.gz
chromium_src-7dd11dba06ec642ef2d6e7dfb2a9d1f807c67380.tar.bz2
Makes ShadowController per-ActivationController and moves shared bits
into Impl class. This is necessitated by each DesktopNativeWidgetAura having its own ActivationClient where the shell only has one. BUG=175441 TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/12316113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/shell.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 1519420..ffa015a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -560,7 +560,7 @@ void Shell::Init() {
if (!command_line->HasSwitch(views::corewm::switches::kNoDropShadows)) {
resize_shadow_controller_.reset(new internal::ResizeShadowController());
shadow_controller_.reset(
- new views::corewm::ShadowController(GetPrimaryRootWindow()));
+ new views::corewm::ShadowController(activation_client_));
}
// Create system_tray_notifier_ before the delegate.