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

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

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate
Patch Set: rebase Created 4 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/test/test_shell_delegate.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 19 matching lines...) Expand all
30 public content::NotificationObserver { 30 public content::NotificationObserver {
31 public: 31 public:
32 ChromeShellDelegate(); 32 ChromeShellDelegate();
33 ~ChromeShellDelegate() override; 33 ~ChromeShellDelegate() override;
34 34
35 // ash::ShellDelegate overrides; 35 // ash::ShellDelegate overrides;
36 bool IsFirstRunAfterBoot() const override; 36 bool IsFirstRunAfterBoot() const override;
37 bool IsMultiProfilesEnabled() const override; 37 bool IsMultiProfilesEnabled() const override;
38 bool IsIncognitoAllowed() const override; 38 bool IsIncognitoAllowed() const override;
39 bool IsRunningInForcedAppMode() const override; 39 bool IsRunningInForcedAppMode() const override;
40 bool CanShowWindowForUser(aura::Window* window) const override; 40 bool CanShowWindowForUser(ash::WmWindow* window) const override;
41 bool IsForceMaximizeOnFirstRun() const override; 41 bool IsForceMaximizeOnFirstRun() const override;
42 void PreInit() override; 42 void PreInit() override;
43 void PreShutdown() override; 43 void PreShutdown() override;
44 void Exit() override; 44 void Exit() override;
45 keyboard::KeyboardUI* CreateKeyboardUI() override; 45 keyboard::KeyboardUI* CreateKeyboardUI() override;
46 void VirtualKeyboardActivated(bool activated) override; 46 void VirtualKeyboardActivated(bool activated) override;
47 void AddVirtualKeyboardStateObserver( 47 void AddVirtualKeyboardStateObserver(
48 ash::VirtualKeyboardStateObserver* observer) override; 48 ash::VirtualKeyboardStateObserver* observer) override;
49 void RemoveVirtualKeyboardStateObserver( 49 void RemoveVirtualKeyboardStateObserver(
50 ash::VirtualKeyboardStateObserver* observer) override; 50 ash::VirtualKeyboardStateObserver* observer) override;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // Proxies events from chrome/browser to ash::UserMetricsRecorder. 87 // Proxies events from chrome/browser to ash::UserMetricsRecorder.
88 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_; 88 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;
89 89
90 std::unique_ptr<chromeos::DisplayConfigurationObserver> 90 std::unique_ptr<chromeos::DisplayConfigurationObserver>
91 display_configuration_observer_; 91 display_configuration_observer_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 93 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
94 }; 94 };
95 95
96 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 96 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.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