| 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 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 #include "ui/aura/env.h" | 265 #include "ui/aura/env.h" |
| 266 #endif // defined(USE_AURA) | 266 #endif // defined(USE_AURA) |
| 267 | 267 |
| 268 #if !defined(OS_ANDROID) | 268 #if !defined(OS_ANDROID) |
| 269 #include "chrome/browser/usb/web_usb_detector.h" | 269 #include "chrome/browser/usb/web_usb_detector.h" |
| 270 #endif | 270 #endif |
| 271 | 271 |
| 272 #if defined(USE_AURA) | 272 #if defined(USE_AURA) |
| 273 #include "chrome/browser/lifetime/application_lifetime.h" | 273 #include "chrome/browser/lifetime/application_lifetime.h" |
| 274 #include "content/public/common/service_manager_connection.h" | 274 #include "content/public/common/service_manager_connection.h" |
| 275 #include "services/shell/runner/common/client_util.h" | 275 #include "services/service_manager/runner/common/client_util.h" |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 #if defined(OS_WIN) || defined(OS_MACOSX) || \ | 278 #if defined(OS_WIN) || defined(OS_MACOSX) || \ |
| 279 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 279 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
| 280 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_durati
on_tracker.h" | 280 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_durati
on_tracker.h" |
| 281 #endif | 281 #endif |
| 282 | 282 |
| 283 using content::BrowserThread; | 283 using content::BrowserThread; |
| 284 | 284 |
| 285 namespace { | 285 namespace { |
| (...skipping 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2228 chromeos::CrosSettings::Shutdown(); | 2228 chromeos::CrosSettings::Shutdown(); |
| 2229 #endif // defined(OS_CHROMEOS) | 2229 #endif // defined(OS_CHROMEOS) |
| 2230 #endif // defined(OS_ANDROID) | 2230 #endif // defined(OS_ANDROID) |
| 2231 } | 2231 } |
| 2232 | 2232 |
| 2233 // Public members: | 2233 // Public members: |
| 2234 | 2234 |
| 2235 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2235 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2236 chrome_extra_parts_.push_back(parts); | 2236 chrome_extra_parts_.push_back(parts); |
| 2237 } | 2237 } |
| OLD | NEW |