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

Side by Side Diff: ash/shell/shell_delegate_impl.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 | « ash/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.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 (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 <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 30 matching lines...) Expand all
41 void RemoveVirtualKeyboardStateObserver( 41 void RemoveVirtualKeyboardStateObserver(
42 VirtualKeyboardStateObserver* observer) override; 42 VirtualKeyboardStateObserver* observer) override;
43 app_list::AppListViewDelegate* GetAppListViewDelegate() override; 43 app_list::AppListViewDelegate* GetAppListViewDelegate() override;
44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
45 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 45 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
46 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 46 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
47 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 47 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
48 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 48 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
49 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 49 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
50 ash::MediaDelegate* CreateMediaDelegate() override; 50 ash::MediaDelegate* CreateMediaDelegate() override;
51 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 51 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
52 const ash::ShelfItem* item) override; 52 const ash::ShelfItem* item) override;
53 GPUSupport* CreateGPUSupport() override; 53 GPUSupport* CreateGPUSupport() override;
54 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
55 gfx::Image GetDeprecatedAcceleratorImage() const override; 55 gfx::Image GetDeprecatedAcceleratorImage() const override;
56 56
57 private: 57 private:
58 ShelfDelegateImpl* shelf_delegate_; 58 ShelfDelegateImpl* shelf_delegate_;
59 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 59 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
62 }; 62 };
63 63
64 } // namespace shell 64 } // namespace shell
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 67 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698