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

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

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)
Patch Set: Address comments. 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
11 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 class DisplayConfigurationObserver; 18 class DisplayConfigurationObserver;
19 } 19 }
20 20
21 namespace keyboard { 21 namespace keyboard {
22 class KeyboardUI; 22 class KeyboardUI;
23 } 23 }
24 24
25 class ChromeLauncherControllerImpl; 25 class ChromeLauncherController;
26 26
27 class ChromeShellDelegate : public ash::ShellDelegate, 27 class ChromeShellDelegate : public ash::ShellDelegate,
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;
(...skipping 28 matching lines...) Expand all
64 // content::NotificationObserver override: 64 // content::NotificationObserver override:
65 void Observe(int type, 65 void Observe(int type,
66 const content::NotificationSource& source, 66 const content::NotificationSource& source,
67 const content::NotificationDetails& details) override; 67 const content::NotificationDetails& details) override;
68 68
69 private: 69 private:
70 void PlatformInit(); 70 void PlatformInit();
71 71
72 content::NotificationRegistrar registrar_; 72 content::NotificationRegistrar registrar_;
73 73
74 std::unique_ptr<ChromeLauncherControllerImpl> launcher_controller_; 74 std::unique_ptr<ChromeLauncherController> launcher_controller_;
75 75
76 std::unique_ptr<chromeos::DisplayConfigurationObserver> 76 std::unique_ptr<chromeos::DisplayConfigurationObserver>
77 display_configuration_observer_; 77 display_configuration_observer_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 79 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
80 }; 80 };
81 81
82 #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/app_list/arc/arc_app_list_prefs.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698