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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void Exit() override; 42 void Exit() override;
43 keyboard::KeyboardUI* CreateKeyboardUI() override; 43 keyboard::KeyboardUI* CreateKeyboardUI() override;
44 void OpenUrlFromArc(const GURL& url) override; 44 void OpenUrlFromArc(const GURL& url) override;
45 void ShelfInit() override; 45 void ShelfInit() override;
46 void ShelfShutdown() override; 46 void ShelfShutdown() override;
47 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; 47 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
48 std::unique_ptr<ash::WallpaperDelegate> CreateWallpaperDelegate() override; 48 std::unique_ptr<ash::WallpaperDelegate> CreateWallpaperDelegate() override;
49 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 49 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
50 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 50 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
51 std::unique_ptr<ash::PaletteDelegate> CreatePaletteDelegate() override; 51 std::unique_ptr<ash::PaletteDelegate> CreatePaletteDelegate() override;
52 ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf, 52 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
53 const ash::ShelfItem* item) override; 53 const ash::ShelfItem* item) override;
54 ash::GPUSupport* CreateGPUSupport() override; 54 ash::GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 55 base::string16 GetProductName() const override;
56 void OpenKeyboardShortcutHelpPage() const override; 56 void OpenKeyboardShortcutHelpPage() const override;
57 gfx::Image GetDeprecatedAcceleratorImage() const override; 57 gfx::Image GetDeprecatedAcceleratorImage() const override;
58 PrefService* GetActiveUserPrefService() const override; 58 PrefService* GetActiveUserPrefService() const override;
59 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 59 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
60 void SetTouchscreenEnabledInPrefs(bool enabled, 60 void SetTouchscreenEnabledInPrefs(bool enabled,
61 bool use_local_state) override; 61 bool use_local_state) override;
62 void UpdateTouchscreenStatusFromPrefs() override; 62 void UpdateTouchscreenStatusFromPrefs() override;
(...skipping 11 matching lines...) Expand all
74 74
75 std::unique_ptr<ChromeLauncherController> launcher_controller_; 75 std::unique_ptr<ChromeLauncherController> launcher_controller_;
76 76
77 std::unique_ptr<chromeos::DisplayConfigurationObserver> 77 std::unique_ptr<chromeos::DisplayConfigurationObserver>
78 display_configuration_observer_; 78 display_configuration_observer_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 80 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
81 }; 81 };
82 82
83 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 83 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_interactive_uitest.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