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

Side by Side Diff: apps/shell/browser/shell_desktop_controller.h

Issue 258893002: app_shell: Add support for mouse cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update build to exclude ImageCursors on android Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | apps/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ 5 #ifndef APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
6 #define APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ 6 #define APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 13 matching lines...) Expand all
24 class BrowserContext; 24 class BrowserContext;
25 } 25 }
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 namespace ui { 28 namespace ui {
29 class UserActivityPowerManagerNotifier; 29 class UserActivityPowerManagerNotifier;
30 } 30 }
31 #endif 31 #endif
32 32
33 namespace wm { 33 namespace wm {
34 class CursorManager;
34 class UserActivityDetector; 35 class UserActivityDetector;
35 class WMTestHelper; 36 class WMTestHelper;
36 } 37 }
37 38
38 namespace apps { 39 namespace apps {
39 40
40 class ShellAppWindow; 41 class ShellAppWindow;
41 42
42 // Handles desktop-related tasks for app_shell. 43 // Handles desktop-related tasks for app_shell.
43 class ShellDesktopController 44 class ShellDesktopController
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 84
84 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
85 scoped_ptr<ui::DisplayConfigurator> display_configurator_; 86 scoped_ptr<ui::DisplayConfigurator> display_configurator_;
86 #endif 87 #endif
87 88
88 // Enable a minimal set of views::corewm to be initialized. 89 // Enable a minimal set of views::corewm to be initialized.
89 scoped_ptr<wm::WMTestHelper> wm_test_helper_; 90 scoped_ptr<wm::WMTestHelper> wm_test_helper_;
90 91
91 scoped_ptr<aura::TestScreen> test_screen_; 92 scoped_ptr<aura::TestScreen> test_screen_;
92 93
94 scoped_ptr<wm::CursorManager> cursor_manager_;
95
93 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; 96 scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
94 #if defined(OS_CHROMEOS) 97 #if defined(OS_CHROMEOS)
95 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 98 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
96 #endif 99 #endif
97 100
98 // The desktop supports a single app window. 101 // The desktop supports a single app window.
99 scoped_ptr<ShellAppWindow> app_window_; 102 scoped_ptr<ShellAppWindow> app_window_;
100 103
101 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); 104 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
102 }; 105 };
103 106
104 } // namespace apps 107 } // namespace apps
105 108
106 #endif // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ 109 #endif // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | apps/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698