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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura_shell/shell.cc

Issue 8894018: Move the concept of Activation to the Shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
« ui/aura_shell/activation_controller.cc ('K') | « ui/aura_shell/shell.h ('k') | ui/aura_shell/stacking_controller.h » ('j') | ui/views/widget/native_widget_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/shell.cc
===================================================================
--- ui/aura_shell/shell.cc (revision 113647)
+++ ui/aura_shell/shell.cc (working copy)
@@ -13,6 +13,7 @@
#include "ui/aura/layout_manager.h"
#include "ui/aura/window.h"
#include "ui/aura/window_types.h"
+#include "ui/aura_shell/activation_controller.h"
#include "ui/aura_shell/app_list.h"
#include "ui/aura_shell/default_container_event_filter.h"
#include "ui/aura_shell/default_container_layout_manager.h"
@@ -178,6 +179,8 @@
aura::RootWindow* root_window = aura::RootWindow::GetInstance();
root_window->SetCursor(aura::kCursorPointer);
+ activation_controller_.reset(new internal::ActivationController);
+
aura::Window::Windows containers;
CreateSpecialContainers(&containers);
aura::Window::Windows::const_iterator i;
« ui/aura_shell/activation_controller.cc ('K') | « ui/aura_shell/shell.h ('k') | ui/aura_shell/stacking_controller.h » ('j') | ui/views/widget/native_widget_aura.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698