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

Side by Side Diff: ash/shell_delegate.h

Issue 10878058: Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SHELL_DELEGATE_H_ 5 #ifndef ASH_SHELL_DELEGATE_H_
6 #define ASH_SHELL_DELEGATE_H_ 6 #define ASH_SHELL_DELEGATE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 11 matching lines...) Expand all
22 class UserActionClient; 22 class UserActionClient;
23 } 23 }
24 } 24 }
25 25
26 namespace views { 26 namespace views {
27 class Widget; 27 class Widget;
28 } 28 }
29 29
30 namespace ash { 30 namespace ash {
31 31
32 class CapsLockDelegate;
32 class LauncherDelegate; 33 class LauncherDelegate;
33 class LauncherModel; 34 class LauncherModel;
34 struct LauncherItem; 35 struct LauncherItem;
35 class SystemTray; 36 class SystemTray;
36 class SystemTrayDelegate; 37 class SystemTrayDelegate;
37 class UserWallpaperDelegate; 38 class UserWallpaperDelegate;
38 39
39 enum UserMetricsAction { 40 enum UserMetricsAction {
40 UMA_ACCEL_NEWTAB_T, 41 UMA_ACCEL_NEWTAB_T,
41 UMA_ACCEL_NEXTWINDOW_F5, 42 UMA_ACCEL_NEXTWINDOW_F5,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // value. 123 // value.
123 virtual LauncherDelegate* CreateLauncherDelegate( 124 virtual LauncherDelegate* CreateLauncherDelegate(
124 ash::LauncherModel* model) = 0; 125 ash::LauncherModel* model) = 0;
125 126
126 // Creates a system-tray delegate. Shell takes ownership of the delegate. 127 // Creates a system-tray delegate. Shell takes ownership of the delegate.
127 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* tray) = 0; 128 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* tray) = 0;
128 129
129 // Creates a user wallpaper delegate. Shell takes ownership of the delegate. 130 // Creates a user wallpaper delegate. Shell takes ownership of the delegate.
130 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() = 0; 131 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() = 0;
131 132
133 // Creates a caps lock delegate. Shell takes ownership of the delegate.
134 virtual CapsLockDelegate* CreateCapsLockDelegate() = 0;
135
132 // Creates a user action client. Shell takes ownership of the object. 136 // Creates a user action client. Shell takes ownership of the object.
133 virtual aura::client::UserActionClient* CreateUserActionClient() = 0; 137 virtual aura::client::UserActionClient* CreateUserActionClient() = 0;
134 138
135 // Opens the feedback page for "Report Issue". 139 // Opens the feedback page for "Report Issue".
136 virtual void OpenFeedbackPage() = 0; 140 virtual void OpenFeedbackPage() = 0;
137 141
138 // Records that the user performed an action. 142 // Records that the user performed an action.
139 virtual void RecordUserMetricsAction(UserMetricsAction action) = 0; 143 virtual void RecordUserMetricsAction(UserMetricsAction action) = 0;
140 }; 144 };
141 145
142 } // namespace ash 146 } // namespace ash
143 147
144 #endif // ASH_SHELL_DELEGATE_H_ 148 #endif // ASH_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698