ash/shell/shell_delegate_impl.h - Issue 11821053: Revert 176087

Side by Side Diff: ash/shell/shell_delegate_impl.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 | « ash/magnifier/magnifier_constants.h ('k') | ash/shell/shell_delegate_impl.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 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 Loading...
39 virtual void RestoreTab() OVERRIDE;	39 virtual void RestoreTab() OVERRIDE;

40 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;	40 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;

41 virtual void ShowKeyboardOverlay() OVERRIDE;	41 virtual void ShowKeyboardOverlay() OVERRIDE;

42 virtual void ShowTaskManager() OVERRIDE;	42 virtual void ShowTaskManager() OVERRIDE;

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

44 virtual void ToggleSpokenFeedback(	44 virtual void ToggleSpokenFeedback(

45 AccessibilityNotificationVisibility notify) OVERRIDE;	45 AccessibilityNotificationVisibility notify) OVERRIDE;

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

47 virtual void ToggleHighContrast() OVERRIDE;	47 virtual void ToggleHighContrast() OVERRIDE;

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

49 virtual void SetMagnifierEnabled(bool enabled) OVERRIDE;	49 virtual void SetMagnifier(MagnifierType type) OVERRIDE;

50 virtual void SetMagnifierType(MagnifierType type) OVERRIDE;

51 virtual bool IsMagnifierEnabled() const OVERRIDE;

52 virtual MagnifierType GetMagnifierType() const OVERRIDE;	50 virtual MagnifierType GetMagnifierType() const OVERRIDE;

53 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;	51 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;

54 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	52 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

55 virtual ash::LauncherDelegate* CreateLauncherDelegate(	53 virtual ash::LauncherDelegate* CreateLauncherDelegate(

56 ash::LauncherModel* model) OVERRIDE;	54 ash::LauncherModel* model) OVERRIDE;

57 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;	55 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

58 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	56 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

59 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	57 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

60 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	58 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

61 virtual void OpenFeedbackPage() OVERRIDE;	59 virtual void OpenFeedbackPage() OVERRIDE;

(...skipping 12 matching lines...) Expand all Loading...
74	72

75 private:	73 private:

76 // Used to update Launcher. Owned by main.	74 // Used to update Launcher. Owned by main.

77 WindowWatcher* watcher_;	75 WindowWatcher* watcher_;

78	76

79 LauncherDelegateImpl* launcher_delegate_;	77 LauncherDelegateImpl* launcher_delegate_;

80	78

81 bool locked_;	79 bool locked_;

82 bool spoken_feedback_enabled_;	80 bool spoken_feedback_enabled_;

83 bool high_contrast_enabled_;	81 bool high_contrast_enabled_;

84 bool screen_magnifier_enabled_;

85 MagnifierType screen_magnifier_type_;	82 MagnifierType screen_magnifier_type_;

86	83

87 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);	84 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);

88 };	85 };

89	86

90 } // namespace shell	87 } // namespace shell

91 } // namespace ash	88 } // namespace ash

92	89

93 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_	90 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_

OLD	NEW