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

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

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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/sysui/context_menu_mus.cc ('k') | ash/sysui/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_SYSUI_SHELL_DELEGATE_MUS_H_ 5 #ifndef ASH_SYSUI_SHELL_DELEGATE_MUS_H_
6 #define ASH_SYSUI_SHELL_DELEGATE_MUS_H_ 6 #define ASH_SYSUI_SHELL_DELEGATE_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 45 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
46 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 46 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
47 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 47 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
48 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 48 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
49 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 49 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
50 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 50 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
51 ash::MediaDelegate* CreateMediaDelegate() override; 51 ash::MediaDelegate* CreateMediaDelegate() override;
52 std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override; 52 std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override;
53 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() 53 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
54 override; 54 override;
55 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, 55 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
56 const ash::ShelfItem* item) override; 56 const ShelfItem* item) override;
57 GPUSupport* CreateGPUSupport() override; 57 GPUSupport* CreateGPUSupport() override;
58 base::string16 GetProductName() const override; 58 base::string16 GetProductName() const override;
59 gfx::Image GetDeprecatedAcceleratorImage() const override; 59 gfx::Image GetDeprecatedAcceleratorImage() const override;
60 60
61 private: 61 private:
62 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; 62 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 64 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
65 }; 65 };
66 66
67 } // namespace sysui 67 } // namespace sysui
68 } // namespace ash 68 } // namespace ash
69 69
70 #endif // ASH_SYSUI_SHELL_DELEGATE_MUS_H_ 70 #endif // ASH_SYSUI_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/sysui/context_menu_mus.cc ('k') | ash/sysui/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698