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

Side by Side Diff: ash/shell/shell_delegate_impl.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/shell.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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 keyboard::KeyboardUI* CreateKeyboardUI() override; 42 keyboard::KeyboardUI* CreateKeyboardUI() override;
43 void OpenUrl(const GURL& url) override; 43 void OpenUrl(const GURL& url) override;
44 app_list::AppListPresenter* GetAppListPresenter() override; 44 app_list::AppListPresenter* GetAppListPresenter() override;
45 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 45 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
46 SystemTrayDelegate* CreateSystemTrayDelegate() override; 46 SystemTrayDelegate* CreateSystemTrayDelegate() override;
47 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 47 UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
48 SessionStateDelegate* CreateSessionStateDelegate() override; 48 SessionStateDelegate* CreateSessionStateDelegate() override;
49 AccessibilityDelegate* CreateAccessibilityDelegate() override; 49 AccessibilityDelegate* CreateAccessibilityDelegate() override;
50 NewWindowDelegate* CreateNewWindowDelegate() override; 50 NewWindowDelegate* CreateNewWindowDelegate() override;
51 MediaDelegate* CreateMediaDelegate() override; 51 MediaDelegate* CreateMediaDelegate() override;
52 std::unique_ptr<PointerDownWatcherDelegate> CreatePointerDownWatcherDelegate() 52 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
53 override; 53 override;
54 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 54 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
55 const ShelfItem* item) override; 55 const ShelfItem* item) override;
56 GPUSupport* CreateGPUSupport() override; 56 GPUSupport* CreateGPUSupport() override;
57 base::string16 GetProductName() const override; 57 base::string16 GetProductName() const override;
58 gfx::Image GetDeprecatedAcceleratorImage() const override; 58 gfx::Image GetDeprecatedAcceleratorImage() const override;
59 59
60 private: 60 private:
61 ShelfDelegateImpl* shelf_delegate_; 61 ShelfDelegateImpl* shelf_delegate_;
62 std::unique_ptr<app_list::AppListPresenterDelegateFactory> 62 std::unique_ptr<app_list::AppListPresenterDelegateFactory>
63 app_list_presenter_delegate_factory_; 63 app_list_presenter_delegate_factory_;
64 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; 64 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 66 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
67 }; 67 };
68 68
69 } // namespace shell 69 } // namespace shell
70 } // namespace ash 70 } // namespace ash
71 71
72 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 72 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698