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

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

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 #include "chrome/browser/oom_priority_manager.h" 151 #include "chrome/browser/oom_priority_manager.h"
152 #include "chrome/browser/ui/views/browser_dialogs.h" 152 #include "chrome/browser/ui/views/browser_dialogs.h"
153 #endif 153 #endif
154 154
155 // TODO(port): several win-only methods have been pulled out of this, but 155 // TODO(port): several win-only methods have been pulled out of this, but
156 // BrowserMain() as a whole needs to be broken apart so that it's usable by 156 // BrowserMain() as a whole needs to be broken apart so that it's usable by
157 // other platforms. For now, it's just a stub. This is a serious work in 157 // other platforms. For now, it's just a stub. This is a serious work in
158 // progress and should not be taken as an indication of a real refactoring. 158 // progress and should not be taken as an indication of a real refactoring.
159 159
160 #if defined(OS_WIN) 160 #if defined(OS_WIN)
161 #include <windows.h>
162 #include <commctrl.h> 161 #include <commctrl.h>
163 #include <shellapi.h> 162 #include <shellapi.h>
163 #include <windows.h>
164 164
165 #include "base/win/scoped_com_initializer.h" 165 #include "app/win/scoped_com_initializer.h"
166 #include "base/win/windows_version.h" 166 #include "base/win/windows_version.h"
167 #include "chrome/browser/browser_trial.h" 167 #include "chrome/browser/browser_trial.h"
168 #include "chrome/browser/browser_util_win.h" 168 #include "chrome/browser/browser_util_win.h"
169 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 169 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
170 #include "chrome/browser/first_run/upgrade_util_win.h" 170 #include "chrome/browser/first_run/upgrade_util_win.h"
171 #include "chrome/browser/net/url_fixer_upper.h" 171 #include "chrome/browser/net/url_fixer_upper.h"
172 #include "chrome/browser/rlz/rlz.h" 172 #include "chrome/browser/rlz/rlz.h"
173 #include "chrome/browser/ui/views/user_data_dir_dialog.h" 173 #include "chrome/browser/ui/views/user_data_dir_dialog.h"
174 #include "chrome/installer/util/helper.h" 174 #include "chrome/installer/util/helper.h"
175 #include "chrome/installer/util/install_util.h" 175 #include "chrome/installer/util/install_util.h"
(...skipping 1524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 if (parsed_command_line.HasSwitch(switches::kDisablePreconnect)) 1700 if (parsed_command_line.HasSwitch(switches::kDisablePreconnect))
1701 preconnect_enabled = false; 1701 preconnect_enabled = false;
1702 else if (parsed_command_line.HasSwitch(switches::kEnablePreconnect)) 1702 else if (parsed_command_line.HasSwitch(switches::kEnablePreconnect))
1703 preconnect_enabled = true; 1703 preconnect_enabled = true;
1704 chrome_browser_net::PredictorInit dns_prefetch( 1704 chrome_browser_net::PredictorInit dns_prefetch(
1705 user_prefs, 1705 user_prefs,
1706 local_state, 1706 local_state,
1707 preconnect_enabled); 1707 preconnect_enabled);
1708 1708
1709 #if defined(OS_WIN) 1709 #if defined(OS_WIN)
1710 base::win::ScopedCOMInitializer com_initializer; 1710 app::win::ScopedCOMInitializer com_initializer;
1711 1711
1712 #if defined(GOOGLE_CHROME_BUILD) 1712 #if defined(GOOGLE_CHROME_BUILD)
1713 // Init the RLZ library. This just binds the dll and schedules a task on the 1713 // Init the RLZ library. This just binds the dll and schedules a task on the
1714 // file thread to be run sometime later. If this is the first run we record 1714 // file thread to be run sometime later. If this is the first run we record
1715 // the installation event. 1715 // the installation event.
1716 bool google_search_default = false; 1716 bool google_search_default = false;
1717 TemplateURLService* template_url_service = 1717 TemplateURLService* template_url_service =
1718 TemplateURLServiceFactory::GetForProfile(profile); 1718 TemplateURLServiceFactory::GetForProfile(profile);
1719 if (template_url_service) { 1719 if (template_url_service) {
1720 const TemplateURL* url_template = 1720 const TemplateURL* url_template =
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 #if defined(OS_CHROMEOS) 2002 #if defined(OS_CHROMEOS)
2003 // To be precise, logout (browser shutdown) is not yet done, but the 2003 // To be precise, logout (browser shutdown) is not yet done, but the
2004 // remaining work is negligible, hence we say LogoutDone here. 2004 // remaining work is negligible, hence we say LogoutDone here.
2005 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2005 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2006 false); 2006 false);
2007 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2007 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2008 #endif 2008 #endif
2009 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2009 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2010 return result_code; 2010 return result_code;
2011 } 2011 }
OLDNEW
« no previous file with comments | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698