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

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: General patch cleanup. 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index cd317d7168feb92a2f9053842dcb174087045814..1b2e0ab03915598c97d98faceeee7931823be125 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -40,6 +40,7 @@
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/app_list_controller.h"
#include "ash/wm/ash_activation_controller.h"
+#include "ash/wm/ash_cursor_platform_delegate.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/base_layout_manager.h"
#include "ash/wm/capture_controller.h"
@@ -198,6 +199,9 @@ Shell::Shell(ShellDelegate* delegate)
#if defined(OS_CHROMEOS)
output_configurator_(new chromeos::OutputConfigurator()),
#endif // defined(OS_CHROMEOS)
+ cursor_platform_delegate_(new AshCursorPlatformDelegate),
+ cursor_manager_(scoped_ptr<views::corewm::CursorPlatformDelegate>(
+ cursor_platform_delegate_)),
browser_context_(NULL),
simulate_modal_window_open_for_testing_(false) {
DCHECK(delegate_.get());

Powered by Google App Engine
This is Rietveld 408576698