Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

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

Issue 1770993002: wip: Refactoring Ash's AppListController, moving the bulk of the logic to chrome/browser/ui/ash/app… Base URL: https://chromium.googlesource.com/chromium/src.git@small_5_apps
Patch Set: AppListShower to new component: //ui/app_list/shower, GetViewDelegate() in GetViewDelegate(), test … Created 4 years, 8 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 | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace app_list {
15 class AppListShowerDelegateFactory;
16 class AppListShowerImpl;
17 }
18
14 namespace keyboard { 19 namespace keyboard {
15 class KeyboardUI; 20 class KeyboardUI;
16 } 21 }
17 22
18 namespace ash { 23 namespace ash {
19 namespace shell { 24 namespace shell {
20 25
21 class ShelfDelegateImpl; 26 class ShelfDelegateImpl;
22 27
23 class ShellDelegateImpl : public ash::ShellDelegate { 28 class ShellDelegateImpl : public ash::ShellDelegate {
(...skipping 10 matching lines...) Expand all
34 void PreInit() override; 39 void PreInit() override;
35 void PreShutdown() override; 40 void PreShutdown() override;
36 void Exit() override; 41 void Exit() override;
37 keyboard::KeyboardUI* CreateKeyboardUI() override; 42 keyboard::KeyboardUI* CreateKeyboardUI() override;
38 void VirtualKeyboardActivated(bool activated) override; 43 void VirtualKeyboardActivated(bool activated) override;
39 void AddVirtualKeyboardStateObserver( 44 void AddVirtualKeyboardStateObserver(
40 VirtualKeyboardStateObserver* observer) override; 45 VirtualKeyboardStateObserver* observer) override;
41 void RemoveVirtualKeyboardStateObserver( 46 void RemoveVirtualKeyboardStateObserver(
42 VirtualKeyboardStateObserver* observer) override; 47 VirtualKeyboardStateObserver* observer) override;
43 void OpenUrl(const GURL& url) override; 48 void OpenUrl(const GURL& url) override;
44 app_list::AppListViewDelegate* GetAppListViewDelegate() override; 49 app_list::AppListShower* GetAppListShower() override;
45 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 50 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
46 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 51 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
47 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 52 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
48 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 53 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
49 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 54 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
50 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 55 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
51 ash::MediaDelegate* CreateMediaDelegate() override; 56 ash::MediaDelegate* CreateMediaDelegate() override;
52 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, 57 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
53 const ash::ShelfItem* item) override; 58 const ash::ShelfItem* item) override;
54 GPUSupport* CreateGPUSupport() override; 59 GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 60 base::string16 GetProductName() const override;
56 gfx::Image GetDeprecatedAcceleratorImage() const override; 61 gfx::Image GetDeprecatedAcceleratorImage() const override;
57 62
58 private: 63 private:
59 ShelfDelegateImpl* shelf_delegate_; 64 ShelfDelegateImpl* shelf_delegate_;
60 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 65 scoped_ptr<app_list::AppListShowerDelegateFactory>
66 app_list_shower_delegate_factory_;
67 scoped_ptr<app_list::AppListShowerImpl> app_list_shower_;
61 68
62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 69 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
63 }; 70 };
64 71
65 } // namespace shell 72 } // namespace shell
66 } // namespace ash 73 } // namespace ash
67 74
68 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 75 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698