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

Unified Diff: ash/shell.cc

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 10 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/shell.h ('k') | ash/test/cursor_manager_test_api.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 e44c477d42c94b9191bd8b5d8a9dc7011dd52c4e..15194203e04308caf6893684a86a91348e668076 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -40,6 +40,7 @@
#include "ash/wm/app_list_controller.h"
#include "ash/wm/ash_activation_controller.h"
#include "ash/wm/ash_focus_rules.h"
+#include "ash/wm/ash_native_cursor_manager.h"
#include "ash/wm/base_layout_manager.h"
#include "ash/wm/capture_controller.h"
#include "ash/wm/coordinate_conversion.h"
@@ -198,6 +199,9 @@ Shell::Shell(ShellDelegate* delegate)
#if defined(OS_CHROMEOS)
output_configurator_(new chromeos::OutputConfigurator()),
#endif // defined(OS_CHROMEOS)
+ native_cursor_manager_(new AshNativeCursorManager),
+ cursor_manager_(scoped_ptr<views::corewm::NativeCursorManager>(
+ native_cursor_manager_)),
browser_context_(NULL),
simulate_modal_window_open_for_testing_(false) {
DCHECK(delegate_.get());
« no previous file with comments | « ash/shell.h ('k') | ash/test/cursor_manager_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698