Chromium Code Reviews| 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/shelf/shelf_item_types.h" | 10 #include "ash/shelf/shelf_item_types.h" |
| 11 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 16 #include "chrome/browser/ui/ash/metrics/user_metrics_recorder_proxy.h" | |
| 16 #include "content/public/browser/notification_observer.h" | 17 #include "content/public/browser/notification_observer.h" |
| 17 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
| 18 | 19 |
| 19 class Browser; | 20 class Browser; |
| 20 | 21 |
| 21 namespace ash { | 22 namespace ash { |
| 22 class ShelfItemDelegate; | 23 class ShelfItemDelegate; |
| 23 } | 24 } |
| 24 | 25 |
| 25 namespace content { | 26 namespace content { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 void PlatformInit(); | 87 void PlatformInit(); |
| 87 | 88 |
| 88 static ChromeShellDelegate* instance_; | 89 static ChromeShellDelegate* instance_; |
| 89 | 90 |
| 90 content::NotificationRegistrar registrar_; | 91 content::NotificationRegistrar registrar_; |
| 91 | 92 |
| 92 ChromeLauncherController* shelf_delegate_; | 93 ChromeLauncherController* shelf_delegate_; |
| 93 | 94 |
| 94 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; | 95 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; |
| 95 | 96 |
| 97 // Proxy's events from chrome/browser to ash::UserMetricsRecorder. | |
|
Alexei Svitkine (slow)
2015/05/15 19:19:56
Nit: Proxies.
But actually, I don't see this clas
bruthig
2015/05/15 19:36:21
Fixed Proxy's to Proxies.
Summary of discussion o
| |
| 98 scoped_ptr<ash::UserMetricsRecorderProxy> user_metrics_recorder_proxy_; | |
| 99 | |
| 96 #if defined(OS_CHROMEOS) | 100 #if defined(OS_CHROMEOS) |
| 97 scoped_ptr<chromeos::DisplayConfigurationObserver> | 101 scoped_ptr<chromeos::DisplayConfigurationObserver> |
| 98 display_configuration_observer_; | 102 display_configuration_observer_; |
| 99 #endif | 103 #endif |
| 100 | 104 |
| 101 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 105 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
| 102 }; | 106 }; |
| 103 | 107 |
| 104 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 108 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
| OLD | NEW |