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

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

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 keyboard::KeyboardUI* CreateKeyboardUI() override; 44 keyboard::KeyboardUI* CreateKeyboardUI() override;
45 void OpenUrl(const GURL& url) override; 45 void OpenUrl(const GURL& url) override;
46 app_list::AppListPresenter* GetAppListPresenter() override; 46 app_list::AppListPresenter* GetAppListPresenter() override;
47 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; 47 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override;
48 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 48 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
49 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 49 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
50 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 50 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
51 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 51 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
52 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 52 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
53 ash::MediaDelegate* CreateMediaDelegate() override; 53 ash::MediaDelegate* CreateMediaDelegate() override;
54 std::unique_ptr<ash::PointerDownWatcherDelegate> 54 std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate()
55 CreatePointerDownWatcherDelegate() override; 55 override;
56 ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf, 56 ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf,
57 const ash::ShelfItem* item) override; 57 const ash::ShelfItem* item) override;
58 ash::GPUSupport* CreateGPUSupport() override; 58 ash::GPUSupport* CreateGPUSupport() override;
59 base::string16 GetProductName() const override; 59 base::string16 GetProductName() const override;
60 void OpenKeyboardShortcutHelpPage() const override; 60 void OpenKeyboardShortcutHelpPage() const override;
61 gfx::Image GetDeprecatedAcceleratorImage() const override; 61 gfx::Image GetDeprecatedAcceleratorImage() const override;
62 void ToggleTouchpad() override; 62 void ToggleTouchpad() override;
63 void ToggleTouchscreen() override; 63 void ToggleTouchscreen() override;
64 64
65 // content::NotificationObserver override: 65 // content::NotificationObserver override:
(...skipping 11 matching lines...) Expand all
77 // Proxies events from chrome/browser to ash::UserMetricsRecorder. 77 // Proxies events from chrome/browser to ash::UserMetricsRecorder.
78 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_; 78 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;
79 79
80 std::unique_ptr<chromeos::DisplayConfigurationObserver> 80 std::unique_ptr<chromeos::DisplayConfigurationObserver>
81 display_configuration_observer_; 81 display_configuration_observer_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 83 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
84 }; 84 };
85 85
86 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 86 #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