chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list.

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

Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix AcceleratorControllerTest.WindowSnap Created 8 years, 2 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/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('J')

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 26 matching lines...) Expand all Loading...
37 virtual bool IsUserLoggedIn() OVERRIDE;	37 virtual bool IsUserLoggedIn() OVERRIDE;

38 virtual bool IsSessionStarted() OVERRIDE;	38 virtual bool IsSessionStarted() OVERRIDE;

39 virtual bool IsFirstRunAfterBoot() OVERRIDE;	39 virtual bool IsFirstRunAfterBoot() OVERRIDE;

40 virtual void LockScreen() OVERRIDE;	40 virtual void LockScreen() OVERRIDE;

41 virtual void UnlockScreen() OVERRIDE;	41 virtual void UnlockScreen() OVERRIDE;

42 virtual bool IsScreenLocked() const OVERRIDE;	42 virtual bool IsScreenLocked() const OVERRIDE;

43 virtual void Shutdown() OVERRIDE;	43 virtual void Shutdown() OVERRIDE;

44 virtual void Exit() OVERRIDE;	44 virtual void Exit() OVERRIDE;

45 virtual void NewTab() OVERRIDE;	45 virtual void NewTab() OVERRIDE;

46 virtual void NewWindow(bool is_incognito) OVERRIDE;	46 virtual void NewWindow(bool is_incognito) OVERRIDE;

	47 virtual void ToggleMaximized() OVERRIDE;

47 virtual void OpenFileManager(bool as_dialog) OVERRIDE;	48 virtual void OpenFileManager(bool as_dialog) OVERRIDE;

48 virtual void OpenCrosh() OVERRIDE;	49 virtual void OpenCrosh() OVERRIDE;

49 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;	50 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;

50 virtual void RestoreTab() OVERRIDE;	51 virtual void RestoreTab() OVERRIDE;

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

52 virtual void ShowKeyboardOverlay() OVERRIDE;	53 virtual void ShowKeyboardOverlay() OVERRIDE;

53 virtual void ShowTaskManager() OVERRIDE;	54 virtual void ShowTaskManager() OVERRIDE;

54 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;	55 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

55 virtual void ToggleSpokenFeedback() OVERRIDE;	56 virtual void ToggleSpokenFeedback() OVERRIDE;

56 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;	57 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;

(...skipping 25 matching lines...) Expand all Loading...
82 content::NotificationRegistrar registrar_;	83 content::NotificationRegistrar registrar_;

83	84

84 scoped_ptr<ash::WindowPositioner> window_positioner_;	85 scoped_ptr<ash::WindowPositioner> window_positioner_;

85	86

86 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	87 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

87	88

88 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	89 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

89 };	90 };

90	91

91 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	92 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW