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

Side by Side Diff: ash/shell/shell_delegate_impl.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/shell.cc ('k') | ash/shell/shell_delegate_impl.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_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_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 28 matching lines...) Expand all
39 virtual void ShowTaskManager() OVERRIDE; 39 virtual void ShowTaskManager() OVERRIDE;
40 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; 40 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
41 virtual void ToggleSpokenFeedback() OVERRIDE; 41 virtual void ToggleSpokenFeedback() OVERRIDE;
42 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE; 42 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
43 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 43 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
44 virtual ash::LauncherDelegate* CreateLauncherDelegate( 44 virtual ash::LauncherDelegate* CreateLauncherDelegate(
45 ash::LauncherModel* model) OVERRIDE; 45 ash::LauncherModel* model) OVERRIDE;
46 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 46 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
47 ash::SystemTray* tray) OVERRIDE; 47 ash::SystemTray* tray) OVERRIDE;
48 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 48 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
49 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
49 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 50 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
50 virtual void OpenFeedbackPage() OVERRIDE; 51 virtual void OpenFeedbackPage() OVERRIDE;
51 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 52 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
52 virtual void HandleMediaNextTrack() OVERRIDE; 53 virtual void HandleMediaNextTrack() OVERRIDE;
53 virtual void HandleMediaPlayPause() OVERRIDE; 54 virtual void HandleMediaPlayPause() OVERRIDE;
54 virtual void HandleMediaPrevTrack() OVERRIDE; 55 virtual void HandleMediaPrevTrack() OVERRIDE;
55 56
56 private: 57 private:
57 // Used to update Launcher. Owned by main. 58 // Used to update Launcher. Owned by main.
58 WindowWatcher* watcher_; 59 WindowWatcher* watcher_;
59 60
60 LauncherDelegateImpl* launcher_delegate_; 61 LauncherDelegateImpl* launcher_delegate_;
61 62
62 bool locked_; 63 bool locked_;
63 bool spoken_feedback_enabled_; 64 bool spoken_feedback_enabled_;
64 65
65 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 66 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
66 }; 67 };
67 68
68 } // namespace shell 69 } // namespace shell
69 } // namespace ash 70 } // namespace ash
70 71
71 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 72 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698