chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 11821053: Revert 176087

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 11821053: Revert 176087 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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/ash_init.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 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 virtual void RestoreTab() OVERRIDE;	54 virtual void RestoreTab() OVERRIDE;

55 virtual bool RotatePaneFocus(ash::Shell::Direction direction) OVERRIDE;	55 virtual bool RotatePaneFocus(ash::Shell::Direction direction) OVERRIDE;

56 virtual void ShowKeyboardOverlay() OVERRIDE;	56 virtual void ShowKeyboardOverlay() OVERRIDE;

57 virtual void ShowTaskManager() OVERRIDE;	57 virtual void ShowTaskManager() OVERRIDE;

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

59 virtual void ToggleHighContrast() OVERRIDE;	59 virtual void ToggleHighContrast() OVERRIDE;

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

61 virtual void ToggleSpokenFeedback(	61 virtual void ToggleSpokenFeedback(

62 ash::AccessibilityNotificationVisibility notify) OVERRIDE;	62 ash::AccessibilityNotificationVisibility notify) OVERRIDE;

63 virtual bool IsHighContrastEnabled() const OVERRIDE;	63 virtual bool IsHighContrastEnabled() const OVERRIDE;

64 virtual void SetMagnifierEnabled(bool enabled) OVERRIDE;	64 virtual void SetMagnifier(ash::MagnifierType type) OVERRIDE;

65 virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE;

66 virtual bool IsMagnifierEnabled() const OVERRIDE;

67 virtual ash::MagnifierType GetMagnifierType() const OVERRIDE;	65 virtual ash::MagnifierType GetMagnifierType() const OVERRIDE;

68 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;	66 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;

69 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	67 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

70 virtual ash::LauncherDelegate* CreateLauncherDelegate(	68 virtual ash::LauncherDelegate* CreateLauncherDelegate(

71 ash::LauncherModel* model) OVERRIDE;	69 ash::LauncherModel* model) OVERRIDE;

72 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;	70 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

73 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	71 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

74 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	72 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

75 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	73 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

76 virtual void OpenFeedbackPage() OVERRIDE;	74 virtual void OpenFeedbackPage() OVERRIDE;

(...skipping 22 matching lines...) Expand all Loading...
99 scoped_ptr<ash::WindowPositioner> window_positioner_;	97 scoped_ptr<ash::WindowPositioner> window_positioner_;

100	98

101 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	99 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

102	100

103 ChromeLauncherController* launcher_delegate_;	101 ChromeLauncherController* launcher_delegate_;

104	102

105 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

106 };	104 };

107	105

108 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW