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

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

Issue 1198483002: Only register the reporter component on Google Chrome builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use proper #define :-) Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 // For Chrome OS this registration is delayed until user login. 463 // For Chrome OS this registration is delayed until user login.
464 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); 464 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path);
465 // Registration of the EV Whitelist component here is not necessary for: 465 // Registration of the EV Whitelist component here is not necessary for:
466 // 1. Android: Because it currently does not have the EV indicator. 466 // 1. Android: Because it currently does not have the EV indicator.
467 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. 467 // 2. Chrome OS: On Chrome OS this registration is delayed until user login.
468 RegisterEVWhitelistComponent(cus, path); 468 RegisterEVWhitelistComponent(cus, path);
469 #endif // defined(OS_ANDROID) 469 #endif // defined(OS_ANDROID)
470 } 470 }
471 471
472 #if defined(OS_WIN) 472 #if defined(OS_WIN)
473 #if defined(GOOGLE_CHROME_BUILD)
473 RegisterSwReporterComponent(cus, g_browser_process->local_state()); 474 RegisterSwReporterComponent(cus, g_browser_process->local_state());
475 #endif // defined(GOOGLE_CHROME_BUILD)
474 RegisterCAPSComponent(cus); 476 RegisterCAPSComponent(cus);
475 #endif // defined(OS_WIN) 477 #endif // defined(OS_WIN)
476 } 478 }
477 479
478 #if !defined(OS_ANDROID) 480 #if !defined(OS_ANDROID)
479 bool ProcessSingletonNotificationCallback( 481 bool ProcessSingletonNotificationCallback(
480 const base::CommandLine& command_line, 482 const base::CommandLine& command_line,
481 const base::FilePath& current_directory) { 483 const base::FilePath& current_directory) {
482 // Drop the request if the browser process is already in shutdown path. 484 // Drop the request if the browser process is already in shutdown path.
483 if (!g_browser_process || g_browser_process->IsShuttingDown()) { 485 if (!g_browser_process || g_browser_process->IsShuttingDown()) {
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 chromeos::CrosSettings::Shutdown(); 1763 chromeos::CrosSettings::Shutdown();
1762 #endif // defined(OS_CHROMEOS) 1764 #endif // defined(OS_CHROMEOS)
1763 #endif // defined(OS_ANDROID) 1765 #endif // defined(OS_ANDROID)
1764 } 1766 }
1765 1767
1766 // Public members: 1768 // Public members:
1767 1769
1768 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1770 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1769 chrome_extra_parts_.push_back(parts); 1771 chrome_extra_parts_.push_back(parts);
1770 } 1772 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698