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

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

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

Powered by Google App Engine
This is Rietveld 408576698