Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 333193002: Adding a SW reporter component updater (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 "
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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 // CRLSetFetcher attempts to load a CRL set from either the local disk or 406 // CRLSetFetcher attempts to load a CRL set from either the local disk or
403 // network. 407 // network.
404 if (!command_line.HasSwitch(switches::kDisableCRLSets)) 408 if (!command_line.HasSwitch(switches::kDisableCRLSets))
405 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); 409 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
406 #endif 410 #endif
407 411
408 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) 412 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT)
409 RegisterCldComponent(cus); 413 RegisterCldComponent(cus);
410 #endif 414 #endif
411 415
416 #if defined(OS_WIN)
417 MaybeRegisterSwReporterComponent(cus, g_browser_process->local_state());
418 #endif
419
412 cus->Start(); 420 cus->Start();
413 } 421 }
414 422
415 #if !defined(OS_ANDROID) 423 #if !defined(OS_ANDROID)
416 bool ProcessSingletonNotificationCallback( 424 bool ProcessSingletonNotificationCallback(
417 const CommandLine& command_line, 425 const CommandLine& command_line,
418 const base::FilePath& current_directory) { 426 const base::FilePath& current_directory) {
419 // Drop the request if the browser process is already in shutdown path. 427 // Drop the request if the browser process is already in shutdown path.
420 if (!g_browser_process || g_browser_process->IsShuttingDown()) 428 if (!g_browser_process || g_browser_process->IsShuttingDown())
421 return false; 429 return false;
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 chromeos::CrosSettings::Shutdown(); 1661 chromeos::CrosSettings::Shutdown();
1654 #endif 1662 #endif
1655 #endif 1663 #endif
1656 } 1664 }
1657 1665
1658 // Public members: 1666 // Public members:
1659 1667
1660 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1668 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1661 chrome_extra_parts_.push_back(parts); 1669 chrome_extra_parts_.push_back(parts);
1662 } 1670 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698