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

Side by Side Diff: ash/shell/shell_delegate_impl.h

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Sync and rebase; cleanup. Created 3 years, 8 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
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 17 matching lines...) Expand all
28 bool IsIncognitoAllowed() const override; 28 bool IsIncognitoAllowed() const override;
29 bool IsMultiProfilesEnabled() const override; 29 bool IsMultiProfilesEnabled() const override;
30 bool IsRunningInForcedAppMode() const override; 30 bool IsRunningInForcedAppMode() const override;
31 bool CanShowWindowForUser(WmWindow* window) const override; 31 bool CanShowWindowForUser(WmWindow* window) const override;
32 bool IsForceMaximizeOnFirstRun() const override; 32 bool IsForceMaximizeOnFirstRun() const override;
33 void PreInit() override; 33 void PreInit() override;
34 void PreShutdown() override; 34 void PreShutdown() override;
35 void Exit() override; 35 void Exit() override;
36 keyboard::KeyboardUI* CreateKeyboardUI() override; 36 keyboard::KeyboardUI* CreateKeyboardUI() override;
37 void OpenUrlFromArc(const GURL& url) override; 37 void OpenUrlFromArc(const GURL& url) override;
38 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
39 SystemTrayDelegate* CreateSystemTrayDelegate() override; 38 SystemTrayDelegate* CreateSystemTrayDelegate() override;
40 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
41 SessionStateDelegate* CreateSessionStateDelegate() override; 40 SessionStateDelegate* CreateSessionStateDelegate() override;
42 AccessibilityDelegate* CreateAccessibilityDelegate() override; 41 AccessibilityDelegate* CreateAccessibilityDelegate() override;
43 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 42 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
44 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 43 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
45 const ShelfItem* item) override; 44 const ShelfItem* item) override;
46 GPUSupport* CreateGPUSupport() override; 45 GPUSupport* CreateGPUSupport() override;
47 base::string16 GetProductName() const override; 46 base::string16 GetProductName() const override;
48 gfx::Image GetDeprecatedAcceleratorImage() const override; 47 gfx::Image GetDeprecatedAcceleratorImage() const override;
49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 48 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
50 void SetTouchscreenEnabledInPrefs(bool enabled, 49 void SetTouchscreenEnabledInPrefs(bool enabled,
51 bool use_local_state) override; 50 bool use_local_state) override;
52 void UpdateTouchscreenStatusFromPrefs() override; 51 void UpdateTouchscreenStatusFromPrefs() override;
53 52
54 private: 53 private:
55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 54 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
56 }; 55 };
57 56
58 } // namespace shell 57 } // namespace shell
59 } // namespace ash 58 } // namespace ash
60 59
61 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 60 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698