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

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

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies Created 4 years, 4 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/shelf_delegate_impl.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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/common/shell_delegate.h" 11 #include "ash/common/shell_delegate.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace app_list { 14 namespace app_list {
15 class AppListPresenterDelegateFactory; 15 class AppListPresenterDelegateFactory;
16 class AppListPresenterImpl; 16 class AppListPresenterImpl;
17 } 17 }
18 18
19 namespace keyboard { 19 namespace keyboard {
20 class KeyboardUI; 20 class KeyboardUI;
21 } 21 }
22 22
23 namespace ash { 23 namespace ash {
24 namespace shell { 24 namespace shell {
25 25
26 class ShelfDelegateImpl;
27
28 class ShellDelegateImpl : public ShellDelegate { 26 class ShellDelegateImpl : public ShellDelegate {
29 public: 27 public:
30 ShellDelegateImpl(); 28 ShellDelegateImpl();
31 ~ShellDelegateImpl() override; 29 ~ShellDelegateImpl() override;
32 30
33 bool IsFirstRunAfterBoot() const override; 31 bool IsFirstRunAfterBoot() const override;
34 bool IsIncognitoAllowed() const override; 32 bool IsIncognitoAllowed() const override;
35 bool IsMultiProfilesEnabled() const override; 33 bool IsMultiProfilesEnabled() const override;
36 bool IsRunningInForcedAppMode() const override; 34 bool IsRunningInForcedAppMode() const override;
37 bool CanShowWindowForUser(WmWindow* window) const override; 35 bool CanShowWindowForUser(WmWindow* window) const override;
(...skipping 12 matching lines...) Expand all
50 NewWindowDelegate* CreateNewWindowDelegate() override; 48 NewWindowDelegate* CreateNewWindowDelegate() override;
51 MediaDelegate* CreateMediaDelegate() override; 49 MediaDelegate* CreateMediaDelegate() override;
52 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 50 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
53 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
54 const ShelfItem* item) override; 52 const ShelfItem* item) override;
55 GPUSupport* CreateGPUSupport() override; 53 GPUSupport* CreateGPUSupport() override;
56 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
57 gfx::Image GetDeprecatedAcceleratorImage() const override; 55 gfx::Image GetDeprecatedAcceleratorImage() const override;
58 56
59 private: 57 private:
60 ShelfDelegateImpl* shelf_delegate_; 58 ShelfDelegate* shelf_delegate_;
61 std::unique_ptr<app_list::AppListPresenterDelegateFactory> 59 std::unique_ptr<app_list::AppListPresenterDelegateFactory>
62 app_list_presenter_delegate_factory_; 60 app_list_presenter_delegate_factory_;
63 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; 61 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
64 62
65 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 63 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
66 }; 64 };
67 65
68 } // namespace shell 66 } // namespace shell
69 } // namespace ash 67 } // namespace ash
70 68
71 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 69 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/shelf_delegate_impl.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698