chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService

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

Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase to master Created 6 years, 3 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

« chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc ('K') | « chrome/browser/ui/app_list/app_list_view_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/shelf/shelf_item_types.h"	10 #include "ash/shelf/shelf_item_types.h"

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 virtual void PreShutdown() OVERRIDE;	56 virtual void PreShutdown() OVERRIDE;

57 virtual void Exit() OVERRIDE;	57 virtual void Exit() OVERRIDE;

58 virtual keyboard::KeyboardControllerProxy*	58 virtual keyboard::KeyboardControllerProxy*

59 CreateKeyboardControllerProxy() OVERRIDE;	59 CreateKeyboardControllerProxy() OVERRIDE;

60 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;	60 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;

61 virtual void AddVirtualKeyboardStateObserver(	61 virtual void AddVirtualKeyboardStateObserver(

62 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;	62 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;

63 virtual void RemoveVirtualKeyboardStateObserver(	63 virtual void RemoveVirtualKeyboardStateObserver(

64 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;	64 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;

65 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;	65 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;

66 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	66 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE;

67 virtual ash::ShelfDelegate* CreateShelfDelegate(	67 virtual ash::ShelfDelegate* CreateShelfDelegate(

68 ash::ShelfModel* model) OVERRIDE;	68 ash::ShelfModel* model) OVERRIDE;

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

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

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

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

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

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

75 virtual ui::MenuModel* CreateContextMenu(	75 virtual ui::MenuModel* CreateContextMenu(

76 aura::Window* root,	76 aura::Window* root,

(...skipping 20 matching lines...) Expand all Loading...
97	97

98 #if defined(OS_CHROMEOS)	98 #if defined(OS_CHROMEOS)

99 scoped_ptr<chromeos::DisplayConfigurationObserver>	99 scoped_ptr<chromeos::DisplayConfigurationObserver>

100 display_configuration_observer_;	100 display_configuration_observer_;

101 #endif	101 #endif

102	102

103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

104 };	104 };

105	105

106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW