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

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

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. Created 4 years, 9 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 | « no previous file | 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 <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 28 matching lines...) Expand all
39 void RemoveVirtualKeyboardStateObserver( 39 void RemoveVirtualKeyboardStateObserver(
40 VirtualKeyboardStateObserver* observer) override; 40 VirtualKeyboardStateObserver* observer) override;
41 app_list::AppListViewDelegate* GetAppListViewDelegate() override; 41 app_list::AppListViewDelegate* GetAppListViewDelegate() override;
42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
43 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 43 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
44 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 44 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
45 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 45 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
46 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 46 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
47 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 47 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
48 ash::MediaDelegate* CreateMediaDelegate() override; 48 ash::MediaDelegate* CreateMediaDelegate() override;
49 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 49 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
50 const ash::ShelfItem* item) override; 50 const ash::ShelfItem* item) override;
51 GPUSupport* CreateGPUSupport() override; 51 GPUSupport* CreateGPUSupport() override;
52 base::string16 GetProductName() const override; 52 base::string16 GetProductName() const override;
53 gfx::Image GetDeprecatedAcceleratorImage() const override; 53 gfx::Image GetDeprecatedAcceleratorImage() const override;
54 54
55 private: 55 private:
56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
57 }; 57 };
58 58
59 } // namespace sysui 59 } // namespace sysui
60 } // namespace ash 60 } // namespace ash
61 61
62 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 62 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698