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

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

Issue 7282054: Remove more unnecessary ChromeURLRequestContext members. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright and chormeos tests. Created 9 years, 5 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/browsing_data_appcache_helper.h » ('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 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after
2001 // Call Recycle() here as late as possible, before going into the loop 2001 // Call Recycle() here as late as possible, before going into the loop
2002 // because Start() will add things to it while creating the main window. 2002 // because Start() will add things to it while creating the main window.
2003 if (pool) 2003 if (pool)
2004 pool->Recycle(); 2004 pool->Recycle();
2005 2005
2006 UMA_HISTOGRAM_MEDIUM_TIMES("Startup.BrowserOpenTabs", 2006 UMA_HISTOGRAM_MEDIUM_TIMES("Startup.BrowserOpenTabs",
2007 base::TimeTicks::Now() - browser_open_start); 2007 base::TimeTicks::Now() - browser_open_start);
2008 2008
2009 // If we're running tests (ui_task is non-null), then we don't want to 2009 // If we're running tests (ui_task is non-null), then we don't want to
2010 // call FetchLanguageListFromTranslateServer 2010 // call FetchLanguageListFromTranslateServer
2011 if (parameters.ui_task == NULL && translate_manager != NULL) 2011 if (parameters.ui_task == NULL && translate_manager != NULL) {
2012 // TODO(willchan): Get rid of this after TranslateManager doesn't use
2013 // the default request context. http://crbug.com/89396.
2014 // This is necessary to force |default_request_context_| to be
2015 // initialized.
2016 profile->GetRequestContext();
Dmitry Polukhin 2011/07/18 08:47:23 It looks like removing this line broke Chrome on C
Dmitry Polukhin 2011/07/18 09:06:12 This line is not guilty. But CL that broke Chrome
willchan no longer on Chromium 2011/07/18 10:20:32 I had encountered that stacktrace earlier in the C
2012 translate_manager->FetchLanguageListFromTranslateServer(user_prefs); 2017 translate_manager->FetchLanguageListFromTranslateServer(user_prefs);
2018 }
2013 2019
2014 RunUIMessageLoop(browser_process.get()); 2020 RunUIMessageLoop(browser_process.get());
2015 } 2021 }
2016 } 2022 }
2017 2023
2018 #if defined(OS_WIN) 2024 #if defined(OS_WIN)
2019 // If it's the first run, log the search engine chosen. We wait until 2025 // If it's the first run, log the search engine chosen. We wait until
2020 // shutdown because otherwise we can't be sure the user has finished 2026 // shutdown because otherwise we can't be sure the user has finished
2021 // selecting a search engine through the dialog reached from the first run 2027 // selecting a search engine through the dialog reached from the first run
2022 // bubble link. 2028 // bubble link.
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 #if defined(OS_CHROMEOS) 2090 #if defined(OS_CHROMEOS)
2085 // To be precise, logout (browser shutdown) is not yet done, but the 2091 // To be precise, logout (browser shutdown) is not yet done, but the
2086 // remaining work is negligible, hence we say LogoutDone here. 2092 // remaining work is negligible, hence we say LogoutDone here.
2087 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2093 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2088 false); 2094 false);
2089 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2095 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2090 #endif 2096 #endif
2091 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2097 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2092 return result_code; 2098 return result_code;
2093 } 2099 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browsing_data_appcache_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698