| OLD | NEW |
| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/launcher/launcher_types.h" | 10 #include "ash/launcher/launcher_types.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace content { | 24 namespace content { |
| 25 class WebContents; | 25 class WebContents; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace keyboard { | 28 namespace keyboard { |
| 29 class KeyboardControllerProxy; | 29 class KeyboardControllerProxy; |
| 30 } | 30 } |
| 31 | 31 |
| 32 #if defined(OS_CHROMEOS) |
| 33 namespace chromeos { |
| 34 class DisplayConfigurationObserver; |
| 35 } |
| 36 #endif |
| 37 |
| 32 class ChromeLauncherController; | 38 class ChromeLauncherController; |
| 33 | 39 |
| 34 class ChromeShellDelegate : public ash::ShellDelegate, | 40 class ChromeShellDelegate : public ash::ShellDelegate, |
| 35 public content::NotificationObserver { | 41 public content::NotificationObserver { |
| 36 public: | 42 public: |
| 37 ChromeShellDelegate(); | 43 ChromeShellDelegate(); |
| 38 virtual ~ChromeShellDelegate(); | 44 virtual ~ChromeShellDelegate(); |
| 39 | 45 |
| 40 static ChromeShellDelegate* instance() { return instance_; } | 46 static ChromeShellDelegate* instance() { return instance_; } |
| 41 | 47 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 81 |
| 76 private: | 82 private: |
| 77 void PlatformInit(); | 83 void PlatformInit(); |
| 78 | 84 |
| 79 static ChromeShellDelegate* instance_; | 85 static ChromeShellDelegate* instance_; |
| 80 | 86 |
| 81 content::NotificationRegistrar registrar_; | 87 content::NotificationRegistrar registrar_; |
| 82 | 88 |
| 83 ChromeLauncherController* shelf_delegate_; | 89 ChromeLauncherController* shelf_delegate_; |
| 84 | 90 |
| 91 #if defined(OS_CHROMEOS) |
| 92 scoped_ptr<chromeos::DisplayConfigurationObserver> |
| 93 display_configuration_observer_; |
| 94 #endif |
| 95 |
| 85 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 96 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
| 86 }; | 97 }; |
| 87 | 98 |
| 88 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 99 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
| OLD | NEW |