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

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

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 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
« no previous file with comments | « ash/public/interfaces/new_window.mojom ('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
(...skipping 28 matching lines...) Expand all
39 void PreShutdown() override; 39 void PreShutdown() override;
40 void Exit() override; 40 void Exit() override;
41 keyboard::KeyboardUI* CreateKeyboardUI() override; 41 keyboard::KeyboardUI* CreateKeyboardUI() override;
42 void OpenUrlFromArc(const GURL& url) override; 42 void OpenUrlFromArc(const GURL& url) override;
43 app_list::AppListPresenter* GetAppListPresenter() override; 43 app_list::AppListPresenter* GetAppListPresenter() override;
44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
45 SystemTrayDelegate* CreateSystemTrayDelegate() override; 45 SystemTrayDelegate* CreateSystemTrayDelegate() override;
46 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 46 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
47 SessionStateDelegate* CreateSessionStateDelegate() override; 47 SessionStateDelegate* CreateSessionStateDelegate() override;
48 AccessibilityDelegate* CreateAccessibilityDelegate() override; 48 AccessibilityDelegate* CreateAccessibilityDelegate() override;
49 NewWindowDelegate* CreateNewWindowDelegate() override;
50 MediaDelegate* CreateMediaDelegate() override; 49 MediaDelegate* CreateMediaDelegate() override;
51 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 50 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
52 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
53 const ShelfItem* item) override; 52 const ShelfItem* item) override;
54 GPUSupport* CreateGPUSupport() override; 53 GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
56 gfx::Image GetDeprecatedAcceleratorImage() const override; 55 gfx::Image GetDeprecatedAcceleratorImage() const override;
57 56
58 private: 57 private:
59 ShelfDelegate* shelf_delegate_; 58 ShelfDelegate* shelf_delegate_;
60 std::unique_ptr<app_list::AppListPresenterDelegateFactory> 59 std::unique_ptr<app_list::AppListPresenterDelegateFactory>
61 app_list_presenter_delegate_factory_; 60 app_list_presenter_delegate_factory_;
62 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; 61 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
63 62
64 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 63 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
65 }; 64 };
66 65
67 } // namespace shell 66 } // namespace shell
68 } // namespace ash 67 } // namespace ash
69 68
70 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 69 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/public/interfaces/new_window.mojom ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698