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 <memory> |
8 #include <string> | 9 #include <string> |
9 | 10 |
10 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h" | 16 #include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h" |
17 #include "content/public/browser/notification_observer.h" | 17 #include "content/public/browser/notification_observer.h" |
18 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
19 | 19 |
20 namespace keyboard { | 20 namespace keyboard { |
21 class KeyboardUI; | 21 class KeyboardUI; |
22 } | 22 } |
23 | 23 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 void PlatformInit(); | 78 void PlatformInit(); |
79 | 79 |
80 content::NotificationRegistrar registrar_; | 80 content::NotificationRegistrar registrar_; |
81 | 81 |
82 ChromeLauncherController* shelf_delegate_; | 82 ChromeLauncherController* shelf_delegate_; |
83 | 83 |
84 base::ObserverList<ash::VirtualKeyboardStateObserver> | 84 base::ObserverList<ash::VirtualKeyboardStateObserver> |
85 keyboard_state_observer_list_; | 85 keyboard_state_observer_list_; |
86 | 86 |
87 // Proxies events from chrome/browser to ash::UserMetricsRecorder. | 87 // Proxies events from chrome/browser to ash::UserMetricsRecorder. |
88 scoped_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_; | 88 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_; |
89 | 89 |
90 #if defined(OS_CHROMEOS) | 90 #if defined(OS_CHROMEOS) |
91 scoped_ptr<chromeos::DisplayConfigurationObserver> | 91 std::unique_ptr<chromeos::DisplayConfigurationObserver> |
92 display_configuration_observer_; | 92 display_configuration_observer_; |
93 #endif | 93 #endif |
94 | 94 |
95 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 95 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
96 }; | 96 }; |
97 | 97 |
98 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 98 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
OLD | NEW |