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

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

Issue 2908643003: [mus+ash] Removes WmWindow from ash/wm/focus_rules (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/focus_rules (rebased) 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
« no previous file with comments | « ash/wm/focus_rules.cc ('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 17 matching lines...) Expand all
28 public content::NotificationObserver { 28 public content::NotificationObserver {
29 public: 29 public:
30 ChromeShellDelegate(); 30 ChromeShellDelegate();
31 ~ChromeShellDelegate() override; 31 ~ChromeShellDelegate() override;
32 32
33 // ash::ShellDelegate overrides; 33 // ash::ShellDelegate overrides;
34 service_manager::Connector* GetShellConnector() const override; 34 service_manager::Connector* GetShellConnector() const override;
35 bool IsMultiProfilesEnabled() const override; 35 bool IsMultiProfilesEnabled() const override;
36 bool IsIncognitoAllowed() const override; 36 bool IsIncognitoAllowed() const override;
37 bool IsRunningInForcedAppMode() const override; 37 bool IsRunningInForcedAppMode() const override;
38 bool CanShowWindowForUser(ash::WmWindow* window) const override; 38 bool CanShowWindowForUser(aura::Window* window) const override;
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;
(...skipping 25 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 | « ash/wm/focus_rules.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