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

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

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test 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 | « chrome/browser/ui/BUILD.gn ('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 28 matching lines...) Expand all
39 bool IsForceMaximizeOnFirstRun() const override; 39 bool IsForceMaximizeOnFirstRun() const override;
40 void PreInit() override; 40 void PreInit() override;
41 void PreShutdown() override; 41 void PreShutdown() override;
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;
50 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 49 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
51 std::unique_ptr<ash::PaletteDelegate> CreatePaletteDelegate() override; 50 std::unique_ptr<ash::PaletteDelegate> CreatePaletteDelegate() override;
52 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, 51 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
53 const ash::ShelfItem* item) override; 52 const ash::ShelfItem* item) override;
54 ash::GPUSupport* CreateGPUSupport() override; 53 ash::GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
56 void OpenKeyboardShortcutHelpPage() const override; 55 void OpenKeyboardShortcutHelpPage() const override;
57 gfx::Image GetDeprecatedAcceleratorImage() const override; 56 gfx::Image GetDeprecatedAcceleratorImage() const override;
58 PrefService* GetActiveUserPrefService() const override; 57 PrefService* GetActiveUserPrefService() const override;
59 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 58 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
(...skipping 14 matching lines...) Expand all
74 73
75 std::unique_ptr<ChromeLauncherController> launcher_controller_; 74 std::unique_ptr<ChromeLauncherController> launcher_controller_;
76 75
77 std::unique_ptr<chromeos::DisplayConfigurationObserver> 76 std::unique_ptr<chromeos::DisplayConfigurationObserver>
78 display_configuration_observer_; 77 display_configuration_observer_;
79 78
80 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 79 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
81 }; 80 };
82 81
83 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 82 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698