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) | |
142 #include "chrome/browser/component_updater/sw_reporter_component_installer_win.h " | |
Sorin Jianu
2014/06/19 19:08:48
It appears OS_WIN specific includes start at line
| |
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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
406 #elif defined(OS_ANDROID) | 410 #elif defined(OS_ANDROID) |
407 // The CRLSet component was enabled for some releases. This code attempts to | 411 // The CRLSet component was enabled for some releases. This code attempts to |
408 // delete it from the local disk of those how may have downloaded it. | 412 // delete it from the local disk of those how may have downloaded it. |
409 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); | 413 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); |
410 #endif | 414 #endif |
411 | 415 |
412 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) | 416 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) |
413 RegisterCldComponent(cus); | 417 RegisterCldComponent(cus); |
414 #endif | 418 #endif |
415 | 419 |
420 #if defined(OS_WIN) | |
Sorin Jianu
2014/06/19 19:08:48
Can we make this code looks like a registration? I
| |
421 ExecutePendingSwReporterComponent(cus, g_browser_process->local_state()); | |
422 #endif | |
423 | |
416 cus->Start(); | 424 cus->Start(); |
417 } | 425 } |
418 | 426 |
419 #if !defined(OS_ANDROID) | 427 #if !defined(OS_ANDROID) |
420 bool ProcessSingletonNotificationCallback( | 428 bool ProcessSingletonNotificationCallback( |
421 const CommandLine& command_line, | 429 const CommandLine& command_line, |
422 const base::FilePath& current_directory) { | 430 const base::FilePath& current_directory) { |
423 // Drop the request if the browser process is already in shutdown path. | 431 // Drop the request if the browser process is already in shutdown path. |
424 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 432 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
425 return false; | 433 return false; |
(...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1655 chromeos::CrosSettings::Shutdown(); | 1663 chromeos::CrosSettings::Shutdown(); |
1656 #endif | 1664 #endif |
1657 #endif | 1665 #endif |
1658 } | 1666 } |
1659 | 1667 |
1660 // Public members: | 1668 // Public members: |
1661 | 1669 |
1662 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1663 chrome_extra_parts_.push_back(parts); | 1671 chrome_extra_parts_.push_back(parts); |
1664 } | 1672 } |
OLD | NEW |