chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 10878058: Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate.

Side by Side Diff: chrome/browser/ui/ash/chrome_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 | « chrome/browser/ui/ash/caps_lock_handler_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

OLD	NEW
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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

7	7

8 #include "ash/launcher/launcher_types.h"	8 #include "ash/launcher/launcher_types.h"

9 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 virtual void ShowTaskManager() OVERRIDE;	52 virtual void ShowTaskManager() OVERRIDE;

53 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;	53 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

54 virtual void ToggleSpokenFeedback() OVERRIDE;	54 virtual void ToggleSpokenFeedback() OVERRIDE;

55 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;	55 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;

56 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	56 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

57 virtual ash::LauncherDelegate* CreateLauncherDelegate(	57 virtual ash::LauncherDelegate* CreateLauncherDelegate(

58 ash::LauncherModel* model) OVERRIDE;	58 ash::LauncherModel* model) OVERRIDE;

59 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(	59 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(

60 ash::SystemTray* tray) OVERRIDE;	60 ash::SystemTray* tray) OVERRIDE;

61 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	61 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

	62 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

62 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	63 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

63 virtual void OpenFeedbackPage() OVERRIDE;	64 virtual void OpenFeedbackPage() OVERRIDE;

64 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;	65 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;

65 virtual void HandleMediaNextTrack() OVERRIDE;	66 virtual void HandleMediaNextTrack() OVERRIDE;

66 virtual void HandleMediaPlayPause() OVERRIDE;	67 virtual void HandleMediaPlayPause() OVERRIDE;

67 virtual void HandleMediaPrevTrack() OVERRIDE;	68 virtual void HandleMediaPrevTrack() OVERRIDE;

68	69

69 // content::NotificationObserver override:	70 // content::NotificationObserver override:

70 virtual void Observe(int type,	71 virtual void Observe(int type,

71 const content::NotificationSource& source,	72 const content::NotificationSource& source,

72 const content::NotificationDetails& details) OVERRIDE;	73 const content::NotificationDetails& details) OVERRIDE;

73	74

74 private:	75 private:

75 static ChromeShellDelegate* instance_;	76 static ChromeShellDelegate* instance_;

76	77

77 content::NotificationRegistrar registrar_;	78 content::NotificationRegistrar registrar_;

78	79

79 scoped_ptr<ash::WindowPositioner> window_positioner_;	80 scoped_ptr<ash::WindowPositioner> window_positioner_;

80	81

81 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	82 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

82	83

83 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	84 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

84 };	85 };

85	86

86 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	87 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW