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

Side by Side Diff: ash/mus/shell_delegate_mus.h

Issue 2199993002: Add generic PaletteDelegate code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@note-options
Patch Set: Nits 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/common/wm_shell.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 28 matching lines...) Expand all
39 keyboard::KeyboardUI* CreateKeyboardUI() override; 39 keyboard::KeyboardUI* CreateKeyboardUI() override;
40 void OpenUrlFromArc(const GURL& url) override; 40 void OpenUrlFromArc(const GURL& url) override;
41 app_list::AppListPresenter* GetAppListPresenter() override; 41 app_list::AppListPresenter* GetAppListPresenter() override;
42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
43 SystemTrayDelegate* CreateSystemTrayDelegate() override; 43 SystemTrayDelegate* CreateSystemTrayDelegate() override;
44 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 44 UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
45 SessionStateDelegate* CreateSessionStateDelegate() override; 45 SessionStateDelegate* CreateSessionStateDelegate() override;
46 AccessibilityDelegate* CreateAccessibilityDelegate() override; 46 AccessibilityDelegate* CreateAccessibilityDelegate() override;
47 NewWindowDelegate* CreateNewWindowDelegate() override; 47 NewWindowDelegate* CreateNewWindowDelegate() override;
48 MediaDelegate* CreateMediaDelegate() override; 48 MediaDelegate* CreateMediaDelegate() override;
49 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
49 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() 50 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
50 override; 51 override;
51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 52 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
52 const ShelfItem* item) override; 53 const ShelfItem* item) override;
53 GPUSupport* CreateGPUSupport() override; 54 GPUSupport* CreateGPUSupport() override;
54 base::string16 GetProductName() const override; 55 base::string16 GetProductName() const override;
55 gfx::Image GetDeprecatedAcceleratorImage() const override; 56 gfx::Image GetDeprecatedAcceleratorImage() const override;
56 57
57 private: 58 private:
58 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; 59 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
59 shell::Connector* connector_; 60 shell::Connector* connector_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
62 }; 63 };
63 64
64 } // namespace ash 65 } // namespace ash
65 66
66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 67 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698