ash/test/test_shell_delegate.h - Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list.

Side by Side Diff: ash/test/test_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: Add ash::wm::ToggleMaximizedWindow to window_util.h 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/shell_delegate.h ('k') | ash/test/test_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 ASH_TEST_TEST_SHELL_DELEGATE_H_	5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_

6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_	6 #define ASH_TEST_TEST_SHELL_DELEGATE_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 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 10 matching lines...) Expand all Loading...
21 virtual bool IsUserLoggedIn() OVERRIDE;	21 virtual bool IsUserLoggedIn() OVERRIDE;

22 virtual bool IsSessionStarted() OVERRIDE;	22 virtual bool IsSessionStarted() OVERRIDE;

23 virtual bool IsFirstRunAfterBoot() OVERRIDE;	23 virtual bool IsFirstRunAfterBoot() OVERRIDE;

24 virtual void LockScreen() OVERRIDE;	24 virtual void LockScreen() OVERRIDE;

25 virtual void UnlockScreen() OVERRIDE;	25 virtual void UnlockScreen() OVERRIDE;

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

27 virtual void Shutdown() OVERRIDE;	27 virtual void Shutdown() OVERRIDE;

28 virtual void Exit() OVERRIDE;	28 virtual void Exit() OVERRIDE;

29 virtual void NewTab() OVERRIDE;	29 virtual void NewTab() OVERRIDE;

30 virtual void NewWindow(bool incognito) OVERRIDE;	30 virtual void NewWindow(bool incognito) OVERRIDE;

	31 virtual void ToggleMaximized() OVERRIDE;

31 virtual void OpenFileManager(bool as_dialog) OVERRIDE;	32 virtual void OpenFileManager(bool as_dialog) OVERRIDE;

32 virtual void OpenCrosh() OVERRIDE;	33 virtual void OpenCrosh() OVERRIDE;

33 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;	34 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;

34 virtual void RestoreTab() OVERRIDE;	35 virtual void RestoreTab() OVERRIDE;

35 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;	36 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;

36 virtual void ShowKeyboardOverlay() OVERRIDE;	37 virtual void ShowKeyboardOverlay() OVERRIDE;

37 virtual void ShowTaskManager() OVERRIDE;	38 virtual void ShowTaskManager() OVERRIDE;

38 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;	39 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

39 virtual void ToggleSpokenFeedback() OVERRIDE;	40 virtual void ToggleSpokenFeedback() OVERRIDE;

40 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;	41 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;

(...skipping 18 matching lines...) Expand all Loading...
59 bool spoken_feedback_enabled_;	60 bool spoken_feedback_enabled_;

60 scoped_ptr<content::BrowserContext> current_browser_context_;	61 scoped_ptr<content::BrowserContext> current_browser_context_;

61	62

62 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	63 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

63 };	64 };

64	65

65 } // namespace test	66 } // namespace test

66 } // namespace ash	67 } // namespace ash

67	68

68 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	69 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW