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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.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/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void RemoveVirtualKeyboardStateObserver( 54 void RemoveVirtualKeyboardStateObserver(
55 ash::VirtualKeyboardStateObserver* observer) override; 55 ash::VirtualKeyboardStateObserver* observer) override;
56 app_list::AppListViewDelegate* GetAppListViewDelegate() override; 56 app_list::AppListViewDelegate* GetAppListViewDelegate() override;
57 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; 57 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override;
58 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 58 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
59 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 59 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
60 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 60 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
61 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 61 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
62 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 62 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
63 ash::MediaDelegate* CreateMediaDelegate() override; 63 ash::MediaDelegate* CreateMediaDelegate() override;
64 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 64 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
65 const ash::ShelfItem* item) override; 65 const ash::ShelfItem* item) override;
66 ash::GPUSupport* CreateGPUSupport() override; 66 ash::GPUSupport* CreateGPUSupport() override;
67 base::string16 GetProductName() const override; 67 base::string16 GetProductName() const override;
68 void OpenKeyboardShortcutHelpPage() const override; 68 void OpenKeyboardShortcutHelpPage() const override;
69 gfx::Image GetDeprecatedAcceleratorImage() const override; 69 gfx::Image GetDeprecatedAcceleratorImage() const override;
70 void ToggleTouchpad() override; 70 void ToggleTouchpad() override;
71 void ToggleTouchscreen() override; 71 void ToggleTouchscreen() override;
72 72
73 // content::NotificationObserver override: 73 // content::NotificationObserver override:
74 void Observe(int type, 74 void Observe(int type,
(...skipping 17 matching lines...) Expand all
92 92
93 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
94 scoped_ptr<chromeos::DisplayConfigurationObserver> 94 scoped_ptr<chromeos::DisplayConfigurationObserver>
95 display_configuration_observer_; 95 display_configuration_observer_;
96 #endif 96 #endif
97 97
98 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 98 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
99 }; 99 };
100 100
101 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 101 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698