ash/test/test_shell_delegate.h - Issue 71653003: ash: Rename LauncherModel to ShelfModel.

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome changes Created 7 years, 1 month 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_launcher_delegate.cc ('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 <string>	8 #include <string>

9	9

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

(...skipping 23 matching lines...) Expand all Loading...
34 virtual bool IsIncognitoAllowed() const OVERRIDE;	34 virtual bool IsIncognitoAllowed() const OVERRIDE;

35 virtual bool IsMultiProfilesEnabled() const OVERRIDE;	35 virtual bool IsMultiProfilesEnabled() const OVERRIDE;

36 virtual bool IsRunningInForcedAppMode() const OVERRIDE;	36 virtual bool IsRunningInForcedAppMode() const OVERRIDE;

37 virtual void PreInit() OVERRIDE;	37 virtual void PreInit() OVERRIDE;

38 virtual void Shutdown() OVERRIDE;	38 virtual void Shutdown() OVERRIDE;

39 virtual void Exit() OVERRIDE;	39 virtual void Exit() OVERRIDE;

40 virtual keyboard::KeyboardControllerProxy*	40 virtual keyboard::KeyboardControllerProxy*

41 CreateKeyboardControllerProxy() OVERRIDE;	41 CreateKeyboardControllerProxy() OVERRIDE;

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

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

44 virtual LauncherDelegate* CreateLauncherDelegate(	44 virtual LauncherDelegate* CreateLauncherDelegate(ShelfModel* model) OVERRIDE;

45 ash::LauncherModel* model) OVERRIDE;

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

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

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

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

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

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

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

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

54 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;	53 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;

55 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;	54 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;

(...skipping 12 matching lines...) Expand all Loading...
68	67

69 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.	68 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.

70	69

71 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	70 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

72 };	71 };

73	72

74 } // namespace test	73 } // namespace test

75 } // namespace ash	74 } // namespace ash

76	75

77 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	76 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW