ash/shell/shell_delegate_impl.h - Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService

Side by Side Diff: ash/shell/shell_delegate_impl.h

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

Patch Set: fix comments 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

« no previous file with comments | « no previous file | ash/shell/shell_delegate_impl.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_SHELL_SHELL_DELEGATE_IMPL_H_	5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_

6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_	6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

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

44 virtual void Exit() OVERRIDE;	44 virtual void Exit() OVERRIDE;

45 virtual keyboard::KeyboardControllerProxy*	45 virtual keyboard::KeyboardControllerProxy*

46 CreateKeyboardControllerProxy() OVERRIDE;	46 CreateKeyboardControllerProxy() OVERRIDE;

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

48 virtual void AddVirtualKeyboardStateObserver(	48 virtual void AddVirtualKeyboardStateObserver(

49 VirtualKeyboardStateObserver* observer) OVERRIDE;	49 VirtualKeyboardStateObserver* observer) OVERRIDE;

50 virtual void RemoveVirtualKeyboardStateObserver(	50 virtual void RemoveVirtualKeyboardStateObserver(

51 VirtualKeyboardStateObserver* observer) OVERRIDE;	51 VirtualKeyboardStateObserver* observer) OVERRIDE;

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

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

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

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

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

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

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

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

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

61 virtual ui::MenuModel* CreateContextMenu(	61 virtual ui::MenuModel* CreateContextMenu(

62 aura::Window* root_window,	62 aura::Window* root_window,

63 ash::ShelfItemDelegate* item_delegate,	63 ash::ShelfItemDelegate* item_delegate,

64 ash::ShelfItem* item) OVERRIDE;	64 ash::ShelfItem* item) OVERRIDE;

65 virtual GPUSupport* CreateGPUSupport() OVERRIDE;	65 virtual GPUSupport* CreateGPUSupport() OVERRIDE;

66 virtual base::string16 GetProductName() const OVERRIDE;	66 virtual base::string16 GetProductName() const OVERRIDE;

67	67

68 private:	68 private:

69 // Used to update Launcher. Owned by main.	69 // Used to update Launcher. Owned by main.

70 WindowWatcher* watcher_;	70 WindowWatcher* watcher_;

71	71

72 ShelfDelegateImpl* shelf_delegate_;	72 ShelfDelegateImpl* shelf_delegate_;

73 content::BrowserContext* browser_context_;	73 content::BrowserContext* browser_context_;

	74 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;

74	75

75 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);	76 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);

76 };	77 };

77	78

78 } // namespace shell	79 } // namespace shell

79 } // namespace ash	80 } // namespace ash

80	81

81 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_	82 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_

OLD	NEW