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

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

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Continued Created 9 years, 10 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_process.h » ('j') | chrome/browser/browser_process_impl.h » ('J')
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 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 // Importing other browser settings is done in a browser-like process 1445 // Importing other browser settings is done in a browser-like process
1446 // that exits when this task has finished. 1446 // that exits when this task has finished.
1447 // TODO(port): Port the Mac's IPC-based implementation to other platforms to 1447 // TODO(port): Port the Mac's IPC-based implementation to other platforms to
1448 // replace this implementation. http://crbug.com/22142 1448 // replace this implementation. http://crbug.com/22142
1449 if (parsed_command_line.HasSwitch(switches::kImport) || 1449 if (parsed_command_line.HasSwitch(switches::kImport) ||
1450 parsed_command_line.HasSwitch(switches::kImportFromFile)) { 1450 parsed_command_line.HasSwitch(switches::kImportFromFile)) {
1451 return FirstRun::ImportNow(profile, parsed_command_line); 1451 return FirstRun::ImportNow(profile, parsed_command_line);
1452 } 1452 }
1453 #endif 1453 #endif
1454 1454
1455 // The system request context can only be initialized once the
1456 // PrefService has been initialized.
brettw 2011/02/11 17:42:34 Why do you need to add this to browser main? Norma
battre 2011/02/14 18:22:05 It is important that the initialization is started
1457 browser_process->InitSystemRequestContext();
1458
1455 #if defined(OS_WIN) 1459 #if defined(OS_WIN)
1456 // Do the tasks if chrome has been upgraded while it was last running. 1460 // Do the tasks if chrome has been upgraded while it was last running.
1457 if (!already_running && Upgrade::DoUpgradeTasks(parsed_command_line)) 1461 if (!already_running && Upgrade::DoUpgradeTasks(parsed_command_line))
1458 return ResultCodes::NORMAL_EXIT; 1462 return ResultCodes::NORMAL_EXIT;
1459 #endif 1463 #endif
1460 1464
1461 // Check if there is any machine level Chrome installed on the current 1465 // Check if there is any machine level Chrome installed on the current
1462 // machine. If yes and the current Chrome process is user level, we do not 1466 // machine. If yes and the current Chrome process is user level, we do not
1463 // allow the user level Chrome to run. So we notify the user and uninstall 1467 // allow the user level Chrome to run. So we notify the user and uninstall
1464 // user level Chrome. 1468 // user level Chrome.
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 #if defined(OS_CHROMEOS) 1812 #if defined(OS_CHROMEOS)
1809 // To be precise, logout (browser shutdown) is not yet done, but the 1813 // To be precise, logout (browser shutdown) is not yet done, but the
1810 // remaining work is negligible, hence we say LogoutDone here. 1814 // remaining work is negligible, hence we say LogoutDone here.
1811 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1815 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1812 false); 1816 false);
1813 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1817 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1814 #endif 1818 #endif
1815 TRACE_EVENT_END("BrowserMain", 0, 0); 1819 TRACE_EVENT_END("BrowserMain", 0, 0);
1816 return result_code; 1820 return result_code;
1817 } 1821 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_process.h » ('j') | chrome/browser/browser_process_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698