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

Side by Side Diff: ash/mus/shell_delegate_mus.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 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/mus/context_menu_mus.cc ('k') | ash/mus/shell_delegate_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_MUS_SHELL_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 22 matching lines...) Expand all
33 void Exit() override; 33 void Exit() override;
34 keyboard::KeyboardUI* CreateKeyboardUI() override; 34 keyboard::KeyboardUI* CreateKeyboardUI() override;
35 void OpenUrlFromArc(const GURL& url) override; 35 void OpenUrlFromArc(const GURL& url) override;
36 void ShelfInit() override; 36 void ShelfInit() override;
37 void ShelfShutdown() override; 37 void ShelfShutdown() override;
38 SystemTrayDelegate* CreateSystemTrayDelegate() override; 38 SystemTrayDelegate* CreateSystemTrayDelegate() override;
39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
40 SessionStateDelegate* CreateSessionStateDelegate() override; 40 SessionStateDelegate* CreateSessionStateDelegate() override;
41 AccessibilityDelegate* CreateAccessibilityDelegate() override; 41 AccessibilityDelegate* CreateAccessibilityDelegate() override;
42 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 42 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
43 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 43 ui::MenuModel* CreateContextMenu(Shelf* shelf,
44 const ShelfItem* item) override; 44 const ShelfItem* item) override;
45 GPUSupport* CreateGPUSupport() override; 45 GPUSupport* CreateGPUSupport() override;
46 base::string16 GetProductName() const override; 46 base::string16 GetProductName() const override;
47 gfx::Image GetDeprecatedAcceleratorImage() const override; 47 gfx::Image GetDeprecatedAcceleratorImage() const override;
48 PrefService* GetActiveUserPrefService() const override; 48 PrefService* GetActiveUserPrefService() const override;
49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
50 void SetTouchscreenEnabledInPrefs(bool enabled, 50 void SetTouchscreenEnabledInPrefs(bool enabled,
51 bool use_local_state) override; 51 bool use_local_state) override;
52 void UpdateTouchscreenStatusFromPrefs() override; 52 void UpdateTouchscreenStatusFromPrefs() override;
53 53
54 private: 54 private:
55 // |connector_| may be null in tests. 55 // |connector_| may be null in tests.
56 service_manager::Connector* connector_; 56 service_manager::Connector* connector_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 58 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
59 }; 59 };
60 60
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/context_menu_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698