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

Side by Side Diff: ash/mus/shell_delegate_mus.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/mus/new_window_delegate_mus.cc ('k') | ash/mus/shell_delegate_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_MUS_SHELL_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/shell_delegate.h" 10 #include "ash/common/shell_delegate.h"
(...skipping 22 matching lines...) Expand all
33 void PreShutdown() override; 33 void PreShutdown() override;
34 void Exit() override; 34 void Exit() override;
35 keyboard::KeyboardUI* CreateKeyboardUI() override; 35 keyboard::KeyboardUI* CreateKeyboardUI() override;
36 void OpenUrlFromArc(const GURL& url) override; 36 void OpenUrlFromArc(const GURL& url) override;
37 app_list::AppListPresenter* GetAppListPresenter() override; 37 app_list::AppListPresenter* GetAppListPresenter() override;
38 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 38 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
39 SystemTrayDelegate* CreateSystemTrayDelegate() override; 39 SystemTrayDelegate* CreateSystemTrayDelegate() override;
40 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 40 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
41 SessionStateDelegate* CreateSessionStateDelegate() override; 41 SessionStateDelegate* CreateSessionStateDelegate() override;
42 AccessibilityDelegate* CreateAccessibilityDelegate() override; 42 AccessibilityDelegate* CreateAccessibilityDelegate() override;
43 NewWindowDelegate* CreateNewWindowDelegate() override;
44 MediaDelegate* CreateMediaDelegate() override; 43 MediaDelegate* CreateMediaDelegate() override;
45 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 44 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
46 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 45 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
47 const ShelfItem* item) override; 46 const ShelfItem* item) override;
48 GPUSupport* CreateGPUSupport() override; 47 GPUSupport* CreateGPUSupport() override;
49 base::string16 GetProductName() const override; 48 base::string16 GetProductName() const override;
50 gfx::Image GetDeprecatedAcceleratorImage() const override; 49 gfx::Image GetDeprecatedAcceleratorImage() const override;
51 50
52 private: 51 private:
53 service_manager::Connector* connector_; 52 service_manager::Connector* connector_;
54 AppListPresenterMus app_list_presenter_; 53 AppListPresenterMus app_list_presenter_;
55 54
56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
57 }; 56 };
58 57
59 } // namespace ash 58 } // namespace ash
60 59
61 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 60 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/new_window_delegate_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698