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

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

Issue 5758002: Make HelpApp component extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor comments resolved Created 9 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "base/string_util.h" 24 #include "base/string_util.h"
25 #include "base/sys_string_conversions.h" 25 #include "base/sys_string_conversions.h"
26 #include "base/threading/platform_thread.h" 26 #include "base/threading/platform_thread.h"
27 #include "base/threading/thread_restrictions.h" 27 #include "base/threading/thread_restrictions.h"
28 #include "base/time.h" 28 #include "base/time.h"
29 #include "base/utf_string_conversions.h" 29 #include "base/utf_string_conversions.h"
30 #include "base/values.h" 30 #include "base/values.h"
31 #include "build/build_config.h" 31 #include "build/build_config.h"
32 #include "chrome/browser/about_flags.h" 32 #include "chrome/browser/about_flags.h"
33 #include "chrome/browser/browser_main_win.h" 33 #include "chrome/browser/browser_main_win.h"
34 #include "chrome/browser/defaults.h"
34 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
35 #include "chrome/browser/browser_process_impl.h" 36 #include "chrome/browser/browser_process_impl.h"
36 #include "chrome/browser/browser_shutdown.h" 37 #include "chrome/browser/browser_shutdown.h"
37 #include "chrome/browser/browser_thread.h" 38 #include "chrome/browser/browser_thread.h"
38 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 39 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
39 #include "chrome/browser/extensions/extension_protocols.h" 40 #include "chrome/browser/extensions/extension_protocols.h"
40 #include "chrome/browser/extensions/extension_service.h" 41 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/extensions/extensions_startup.h" 42 #include "chrome/browser/extensions/extensions_startup.h"
42 #include "chrome/browser/first_run/first_run.h" 43 #include "chrome/browser/first_run/first_run.h"
43 #include "chrome/browser/jankometer.h" 44 #include "chrome/browser/jankometer.h"
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable()) 1055 if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable())
1055 breakpad_enabled = getenv(env_vars::kHeadless) != NULL; 1056 breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
1056 #endif // #if defined(OS_CHROMEOS) 1057 #endif // #if defined(OS_CHROMEOS)
1057 return breakpad_enabled; 1058 return breakpad_enabled;
1058 } 1059 }
1059 #endif // #if defined(USE_LINUX_BREAKPAD) 1060 #endif // #if defined(USE_LINUX_BREAKPAD)
1060 1061
1061 // Main routine for running as the Browser process. 1062 // Main routine for running as the Browser process.
1062 int BrowserMain(const MainFunctionParams& parameters) { 1063 int BrowserMain(const MainFunctionParams& parameters) {
1063 TRACE_EVENT_BEGIN("BrowserMain", 0, ""); 1064 TRACE_EVENT_BEGIN("BrowserMain", 0, "");
1065
1066 // If we're running tests (ui_task is non-null).
1067 if (parameters.ui_task)
1068 browser_defaults::enable_help_app = false;
1069
1064 scoped_ptr<BrowserMainParts> 1070 scoped_ptr<BrowserMainParts>
1065 parts(BrowserMainParts::CreateBrowserMainParts(parameters)); 1071 parts(BrowserMainParts::CreateBrowserMainParts(parameters));
1066 1072
1067 parts->EarlyInitialization(); 1073 parts->EarlyInitialization();
1068 1074
1069 // Must happen before we try to use a message loop or display any UI. 1075 // Must happen before we try to use a message loop or display any UI.
1070 InitializeToolkit(parameters); 1076 InitializeToolkit(parameters);
1071 1077
1072 parts->MainMessageLoopStart(); 1078 parts->MainMessageLoopStart();
1073 1079
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 #if defined(OS_CHROMEOS) 1783 #if defined(OS_CHROMEOS)
1778 // To be precise, logout (browser shutdown) is not yet done, but the 1784 // To be precise, logout (browser shutdown) is not yet done, but the
1779 // remaining work is negligible, hence we say LogoutDone here. 1785 // remaining work is negligible, hence we say LogoutDone here.
1780 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1786 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1781 false); 1787 false);
1782 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1788 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1783 #endif 1789 #endif
1784 TRACE_EVENT_END("BrowserMain", 0, 0); 1790 TRACE_EVENT_END("BrowserMain", 0, 0);
1785 return result_code; 1791 return result_code;
1786 } 1792 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698