chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 71653003: ash: Rename LauncherModel to ShelfModel.

Side by Side Diff: chrome/browser/ui/ash/chrome_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/wm/window_animations.cc ('k') | chrome/browser/ui/ash/chrome_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 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 <string>	8 #include <string>

9	9

10 #include "ash/launcher/launcher_types.h"	10 #include "ash/launcher/launcher_types.h"

(...skipping 30 matching lines...) Expand all Loading...
41 virtual bool IsIncognitoAllowed() const OVERRIDE;	41 virtual bool IsIncognitoAllowed() const OVERRIDE;

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

43 virtual void PreInit() OVERRIDE;	43 virtual void PreInit() OVERRIDE;

44 virtual void Shutdown() OVERRIDE;	44 virtual void Shutdown() OVERRIDE;

45 virtual void Exit() OVERRIDE;	45 virtual void Exit() OVERRIDE;

46 virtual keyboard::KeyboardControllerProxy*	46 virtual keyboard::KeyboardControllerProxy*

47 CreateKeyboardControllerProxy() OVERRIDE;	47 CreateKeyboardControllerProxy() OVERRIDE;

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

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

50 virtual ash::LauncherDelegate* CreateLauncherDelegate(	50 virtual ash::LauncherDelegate* CreateLauncherDelegate(

51 ash::LauncherModel* model) OVERRIDE;	51 ash::ShelfModel* model) OVERRIDE;

52 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;	52 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

53 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	53 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

54 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	54 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

55 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;	55 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;

56 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;	56 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;

57 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;	57 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;

58 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;	58 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;

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

60 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;	60 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;

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

(...skipping 11 matching lines...) Expand all Loading...
73 static ChromeShellDelegate* instance_;	73 static ChromeShellDelegate* instance_;

74	74

75 content::NotificationRegistrar registrar_;	75 content::NotificationRegistrar registrar_;

76	76

77 ChromeLauncherController* launcher_delegate_;	77 ChromeLauncherController* launcher_delegate_;

78	78

79 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	79 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

80 };	80 };

81	81

82 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	82 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW