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

Side by Side Diff: ash/test/test_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: rebase 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
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/test/test_shell_delegate.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 (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_TEST_TEST_SHELL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
7 7
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
(...skipping 23 matching lines...) Expand all
34 virtual void ShowKeyboardOverlay() OVERRIDE; 34 virtual void ShowKeyboardOverlay() OVERRIDE;
35 virtual void ShowTaskManager() OVERRIDE; 35 virtual void ShowTaskManager() OVERRIDE;
36 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; 36 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
37 virtual void ToggleSpokenFeedback() OVERRIDE; 37 virtual void ToggleSpokenFeedback() OVERRIDE;
38 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE; 38 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
39 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 39 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
40 virtual LauncherDelegate* CreateLauncherDelegate( 40 virtual LauncherDelegate* CreateLauncherDelegate(
41 ash::LauncherModel* model) OVERRIDE; 41 ash::LauncherModel* model) OVERRIDE;
42 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE; 42 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
43 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 43 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
44 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
44 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 45 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
45 virtual void OpenFeedbackPage() OVERRIDE; 46 virtual void OpenFeedbackPage() OVERRIDE;
46 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 47 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
47 virtual void HandleMediaNextTrack() OVERRIDE; 48 virtual void HandleMediaNextTrack() OVERRIDE;
48 virtual void HandleMediaPlayPause() OVERRIDE; 49 virtual void HandleMediaPlayPause() OVERRIDE;
49 virtual void HandleMediaPrevTrack() OVERRIDE; 50 virtual void HandleMediaPrevTrack() OVERRIDE;
50 51
51 private: 52 private:
52 bool locked_; 53 bool locked_;
53 bool spoken_feedback_enabled_; 54 bool spoken_feedback_enabled_;
54 55
55 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 56 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
56 }; 57 };
57 58
58 } // namespace test 59 } // namespace test
59 } // namespace ash 60 } // namespace ash
60 61
61 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 62 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698