| 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/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/task/cancelable_task_tracker.h" | 10 #include "base/task/cancelable_task_tracker.h" |
| 10 #include "chrome/browser/chrome_browser_main_linux.h" | 11 #include "chrome/browser/chrome_browser_main_linux.h" |
| 11 #include "chrome/browser/chromeos/external_metrics.h" | 12 #include "chrome/browser/chromeos/external_metrics.h" |
| 12 #include "chromeos/system/version_loader.h" | 13 #include "chromeos/system/version_loader.h" |
| 13 | 14 |
| 14 namespace session_manager { | 15 namespace session_manager { |
| 15 class SessionManager; | 16 class SessionManager; |
| 16 } | 17 } |
| 17 | 18 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; | 83 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
| 83 | 84 |
| 84 scoped_ptr<arc::ArcServiceManager> arc_service_manager_; | 85 scoped_ptr<arc::ArcServiceManager> arc_service_manager_; |
| 85 | 86 |
| 86 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 87 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
| 87 }; | 88 }; |
| 88 | 89 |
| 89 } // namespace chromeos | 90 } // namespace chromeos |
| 90 | 91 |
| 91 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 92 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| OLD | NEW |