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_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/task/cancelable_task_tracker.h" | 9 #include "base/task/cancelable_task_tracker.h" |
| 10 #include "chrome/browser/chrome_browser_main_linux.h" | 10 #include "chrome/browser/chrome_browser_main_linux.h" |
| 11 #include "chrome/browser/chromeos/external_metrics.h" | 11 #include "chrome/browser/chromeos/external_metrics.h" |
| 12 #include "chromeos/system/version_loader.h" | 12 #include "chromeos/system/version_loader.h" |
| 13 | 13 |
| 14 namespace session_manager { | 14 namespace session_manager { |
| 15 class SessionManager; | 15 class SessionManager; |
| 16 } | 16 } |
| 17 | 17 |
| 18 #if defined(ENABLE_ARC) | 18 #if defined(ENABLE_ARC) |
| 19 namespace arc { | 19 namespace arc { |
| 20 class ArcBridgeService; | 20 class ArcBridgeServiceImpl; |
| 21 } | 21 } |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace chromeos { | 24 namespace chromeos { |
| 25 | 25 |
| 26 class DataPromoNotification; | 26 class DataPromoNotification; |
| 27 class EventRewriter; | 27 class EventRewriter; |
| 28 class EventRewriterController; | 28 class EventRewriterController; |
| 29 class IdleActionWarningObserver; | 29 class IdleActionWarningObserver; |
| 30 class MagnificationManager; | 30 class MagnificationManager; |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 | 77 |
| 78 scoped_ptr<internal::DBusServices> dbus_services_; | 78 scoped_ptr<internal::DBusServices> dbus_services_; |
| 79 | 79 |
| 80 scoped_ptr<session_manager::SessionManager> session_manager_; | 80 scoped_ptr<session_manager::SessionManager> session_manager_; |
| 81 | 81 |
| 82 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; | 82 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; |
| 83 | 83 |
| 84 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; | 84 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
| 85 | 85 |
| 86 #if defined(ENABLE_ARC) | 86 #if defined(ENABLE_ARC) |
| 87 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_; | 87 scoped_ptr<arc::ArcBridgeServiceImpl> arc_bridge_service_; |
|
jochen (gone - plz use gerrit)
2015/11/24 13:14:03
why are you directly using the Impl instead of hav
khmel1
2015/11/25 03:35:42
Good point, thanks. Done
| |
| 88 #endif | 88 #endif |
| 89 | 89 |
| 90 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 90 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 } // namespace chromeos | 93 } // namespace chromeos |
| 94 | 94 |
| 95 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 95 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| OLD | NEW |