Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2733)

Unified Diff: ash/shell.cc

Issue 10824364: [NOT FOR REVIEW] ash: Add some implementation for the window management extension API. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index c6eb4d3773eaa1c164691ccd596b751986f9b65e..8fb3be0d0dbdf4f219dffb384728496cc65bb790 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -60,6 +60,7 @@
#include "ash/wm/video_detector.h"
#include "ash/wm/visibility_controller.h"
#include "ash/wm/window_cycle_controller.h"
+#include "ash/wm/window_manager_extension.h"
#include "ash/wm/window_modality_controller.h"
#include "ash/wm/window_util.h"
#include "ash/wm/window_properties.h"
@@ -452,6 +453,13 @@ void Shell::Init() {
InitRootWindowController(root_window_controller);
+ // Note: This needs to happen after the root-window is initialized since it
+ // needs the activation-client.
+ internal::WindowManagerExtension* wm_extension =
+ new internal::WindowManagerExtension();
+ if (delegate_.get())
+ wm_extension->set_delegate(delegate_->CreateWindowManagerDelegate());
+
// Initialize Primary RootWindow specific items.
status_area_widget_ = new internal::StatusAreaWidget();
status_area_widget_->CreateTrayViews(delegate_.get());
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698