trunk/src/ash/test/test_shell_delegate.h - Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient."

Side by Side Diff: trunk/src/ash/test/test_shell_delegate.h

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 9 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 | « trunk/src/ash/shell_delegate.h ('k') | trunk/src/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 <string>	8 #include <string>

9	9

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

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;	42 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;

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

44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;	44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;

45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;	45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;	48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;

49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;	49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;

50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;	50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;

51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;	51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;

	52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

52 virtual ui::MenuModel* CreateContextMenu(	53 virtual ui::MenuModel* CreateContextMenu(

53 aura::Window* root,	54 aura::Window* root,

54 ash::ShelfItemDelegate* item_delegate,	55 ash::ShelfItemDelegate* item_delegate,

55 ash::ShelfItem* item) OVERRIDE;	56 ash::ShelfItem* item) OVERRIDE;

56 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;	57 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;

57 virtual GPUSupport* CreateGPUSupport() OVERRIDE;	58 virtual GPUSupport* CreateGPUSupport() OVERRIDE;

58 virtual base::string16 GetProductName() const OVERRIDE;	59 virtual base::string16 GetProductName() const OVERRIDE;

59	60

60 int num_exit_requests() const { return num_exit_requests_; }	61 int num_exit_requests() const { return num_exit_requests_; }

61	62

62 TestSessionStateDelegate* test_session_state_delegate();	63 TestSessionStateDelegate* test_session_state_delegate();

63	64

64 private:	65 private:

65 int num_exit_requests_;	66 int num_exit_requests_;

66 bool multi_profiles_enabled_;	67 bool multi_profiles_enabled_;

67	68

68 scoped_ptr<content::BrowserContext> active_browser_context_;	69 scoped_ptr<content::BrowserContext> active_browser_context_;

69	70

70 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.	71 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.

71	72

72 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	73 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

73 };	74 };

74	75

75 } // namespace test	76 } // namespace test

76 } // namespace ash	77 } // namespace ash

77	78

78 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	79 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW