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 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 #include "net/base/net_module.h" | 131 #include "net/base/net_module.h" |
| 132 #include "net/base/sdch_manager.h" | 132 #include "net/base/sdch_manager.h" |
| 133 #include "net/cookies/cookie_monster.h" | 133 #include "net/cookies/cookie_monster.h" |
| 134 #include "net/http/http_network_layer.h" | 134 #include "net/http/http_network_layer.h" |
| 135 #include "net/http/http_stream_factory.h" | 135 #include "net/http/http_stream_factory.h" |
| 136 #include "net/url_request/url_request.h" | 136 #include "net/url_request/url_request.h" |
| 137 #include "ui/base/l10n/l10n_util.h" | 137 #include "ui/base/l10n/l10n_util.h" |
| 138 #include "ui/base/layout.h" | 138 #include "ui/base/layout.h" |
| 139 #include "ui/base/resource/resource_bundle.h" | 139 #include "ui/base/resource/resource_bundle.h" |
| 140 | 140 |
| 141 #if defined(OS_WIN) | |
|
Sorin Jianu
2014/06/20 00:31:43
do we want to move this to line 167 and below wher
MAD
2014/06/20 04:51:59
Done.
| |
| 142 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | |
| 143 #endif | |
| 144 | |
| 141 #if defined(OS_ANDROID) | 145 #if defined(OS_ANDROID) |
| 142 #include "chrome/browser/metrics/thread_watcher_android.h" | 146 #include "chrome/browser/metrics/thread_watcher_android.h" |
| 143 #else | 147 #else |
| 144 #include "chrome/browser/feedback/feedback_profile_observer.h" | 148 #include "chrome/browser/feedback/feedback_profile_observer.h" |
| 145 #endif | 149 #endif |
| 146 | 150 |
| 147 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 151 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 148 #include "chrome/browser/first_run/upgrade_util_linux.h" | 152 #include "chrome/browser/first_run/upgrade_util_linux.h" |
| 149 #include "chrome/browser/sxs_linux.h" | 153 #include "chrome/browser/sxs_linux.h" |
| 150 #endif | 154 #endif |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 400 #elif defined(OS_ANDROID) | 404 #elif defined(OS_ANDROID) |
| 401 // The CRLSet component was enabled for some releases. This code attempts to | 405 // The CRLSet component was enabled for some releases. This code attempts to |
| 402 // delete it from the local disk of those how may have downloaded it. | 406 // delete it from the local disk of those how may have downloaded it. |
| 403 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); | 407 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); |
| 404 #endif | 408 #endif |
| 405 | 409 |
| 406 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) | 410 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) |
| 407 RegisterCldComponent(cus); | 411 RegisterCldComponent(cus); |
| 408 #endif | 412 #endif |
| 409 | 413 |
| 414 #if defined(OS_WIN) | |
| 415 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | |
| 416 #endif | |
| 417 | |
| 410 cus->Start(); | 418 cus->Start(); |
| 411 } | 419 } |
| 412 | 420 |
| 413 #if !defined(OS_ANDROID) | 421 #if !defined(OS_ANDROID) |
| 414 bool ProcessSingletonNotificationCallback( | 422 bool ProcessSingletonNotificationCallback( |
| 415 const CommandLine& command_line, | 423 const CommandLine& command_line, |
| 416 const base::FilePath& current_directory) { | 424 const base::FilePath& current_directory) { |
| 417 // Drop the request if the browser process is already in shutdown path. | 425 // Drop the request if the browser process is already in shutdown path. |
| 418 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 426 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
| 419 return false; | 427 return false; |
| (...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1649 chromeos::CrosSettings::Shutdown(); | 1657 chromeos::CrosSettings::Shutdown(); |
| 1650 #endif | 1658 #endif |
| 1651 #endif | 1659 #endif |
| 1652 } | 1660 } |
| 1653 | 1661 |
| 1654 // Public members: | 1662 // Public members: |
| 1655 | 1663 |
| 1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1664 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1657 chrome_extra_parts_.push_back(parts); | 1665 chrome_extra_parts_.push_back(parts); |
| 1658 } | 1666 } |
| OLD | NEW |