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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 2086143002: Convert TrayEventFilter to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak 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/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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ash::VirtualKeyboardStateObserver* observer) override; 50 ash::VirtualKeyboardStateObserver* observer) override;
51 void OpenUrl(const GURL& url) override; 51 void OpenUrl(const GURL& url) override;
52 app_list::AppListPresenter* GetAppListPresenter() override; 52 app_list::AppListPresenter* GetAppListPresenter() override;
53 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; 53 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override;
54 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 54 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
55 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 55 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
56 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 56 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
57 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 57 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
58 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 58 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
59 ash::MediaDelegate* CreateMediaDelegate() override; 59 ash::MediaDelegate* CreateMediaDelegate() override;
60 std::unique_ptr<ash::ContainerDelegate> CreateContainerDelegate() override;
61 std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate() 60 std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate()
62 override; 61 override;
63 ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf, 62 ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf,
64 const ash::ShelfItem* item) override; 63 const ash::ShelfItem* item) override;
65 ash::GPUSupport* CreateGPUSupport() override; 64 ash::GPUSupport* CreateGPUSupport() override;
66 base::string16 GetProductName() const override; 65 base::string16 GetProductName() const override;
67 void OpenKeyboardShortcutHelpPage() const override; 66 void OpenKeyboardShortcutHelpPage() const override;
68 gfx::Image GetDeprecatedAcceleratorImage() const override; 67 gfx::Image GetDeprecatedAcceleratorImage() const override;
69 void ToggleTouchpad() override; 68 void ToggleTouchpad() override;
70 void ToggleTouchscreen() override; 69 void ToggleTouchscreen() override;
(...skipping 16 matching lines...) Expand all
87 // Proxies events from chrome/browser to ash::UserMetricsRecorder. 86 // Proxies events from chrome/browser to ash::UserMetricsRecorder.
88 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_; 87 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;
89 88
90 std::unique_ptr<chromeos::DisplayConfigurationObserver> 89 std::unique_ptr<chromeos::DisplayConfigurationObserver>
91 display_configuration_observer_; 90 display_configuration_observer_;
92 91
93 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 92 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
94 }; 93 };
95 94
96 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 95 #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