OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ | 5 #ifndef CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ |
6 #define CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ | 6 #define CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
11 #include "base/macros.h" | 13 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 15 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
15 #include "ui/gfx/display_observer.h" | 16 #include "ui/gfx/display_observer.h" |
16 | 17 |
17 class ChromeBrowserMainParts; | 18 class ChromeBrowserMainParts; |
18 | 19 |
19 namespace chrome { | 20 namespace chrome { |
20 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts); | 21 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts); |
21 } | 22 } |
22 | 23 |
(...skipping 29 matching lines...) Expand all Loading... |
52 void EmitDisplaysChangedMetric(); | 53 void EmitDisplaysChangedMetric(); |
53 | 54 |
54 // A cached value for the number of displays. | 55 // A cached value for the number of displays. |
55 int display_count_; | 56 int display_count_; |
56 | 57 |
57 // True iff |this| instance is registered as an observer of the native | 58 // True iff |this| instance is registered as an observer of the native |
58 // screen. | 59 // screen. |
59 bool is_screen_observer_; | 60 bool is_screen_observer_; |
60 | 61 |
61 #if defined(USE_OZONE) || defined(USE_X11) | 62 #if defined(USE_OZONE) || defined(USE_X11) |
62 scoped_ptr<ui::InputDeviceEventObserver> input_device_event_observer_; | 63 std::unique_ptr<ui::InputDeviceEventObserver> input_device_event_observer_; |
63 #endif // defined(USE_OZONE) || defined(USE_X11) | 64 #endif // defined(USE_OZONE) || defined(USE_X11) |
64 | 65 |
65 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetrics); | 66 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetrics); |
66 }; | 67 }; |
67 | 68 |
68 #endif // CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ | 69 #endif // CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_ |
OLD | NEW |