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

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

Issue 14698027: Move winaura specific methods and members from chrome/browser/browser_process.h to chrome/browser/b… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in testing_browser_process_platform_part.h Created 7 years, 7 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
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 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 #include "chrome/browser/ui/network_profile_bubble.h" 172 #include "chrome/browser/ui/network_profile_bubble.h"
173 #include "chrome/installer/util/helper.h" 173 #include "chrome/installer/util/helper.h"
174 #include "chrome/installer/util/install_util.h" 174 #include "chrome/installer/util/install_util.h"
175 #include "chrome/installer/util/shell_util.h" 175 #include "chrome/installer/util/shell_util.h"
176 #include "net/base/net_util.h" 176 #include "net/base/net_util.h"
177 #include "printing/printed_document.h" 177 #include "printing/printed_document.h"
178 #include "ui/base/l10n/l10n_util_win.h" 178 #include "ui/base/l10n/l10n_util_win.h"
179 #include "ui/base/win/dpi.h" 179 #include "ui/base/win/dpi.h"
180 #endif // defined(OS_WIN) 180 #endif // defined(OS_WIN)
181 181
182 #if defined(OS_WIN) && defined(USE_AURA)
183 #include "chrome/browser/browser_process_platform_part_aurawin.h"
184 #else
185 #include "chrome/browser/browser_process_platform_part.h"
186 #endif
187
182 #if defined(OS_MACOSX) 188 #if defined(OS_MACOSX)
183 #include <Security/Security.h> 189 #include <Security/Security.h>
184 190
185 #include "base/mac/scoped_nsautorelease_pool.h" 191 #include "base/mac/scoped_nsautorelease_pool.h"
186 #include "chrome/browser/mac/keystone_glue.h" 192 #include "chrome/browser/mac/keystone_glue.h"
187 #endif 193 #endif
188 194
189 #if defined(ENABLE_CONFIGURATION_POLICY) 195 #if defined(ENABLE_CONFIGURATION_POLICY)
190 #include "policy/policy_constants.h" 196 #include "policy/policy_constants.h"
191 #endif 197 #endif
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) { 434 if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
429 std::string start_time_string = 435 std::string start_time_string =
430 command_line.GetSwitchValueASCII(switches::kOriginalProcessStartTime); 436 command_line.GetSwitchValueASCII(switches::kOriginalProcessStartTime);
431 int64 remote_start_time; 437 int64 remote_start_time;
432 base::StringToInt64(start_time_string, &remote_start_time); 438 base::StringToInt64(start_time_string, &remote_start_time);
433 UMA_HISTOGRAM_LONG_TIMES( 439 UMA_HISTOGRAM_LONG_TIMES(
434 "Startup.WarmStartTimeFromRemoteProcessStart", 440 "Startup.WarmStartTimeFromRemoteProcessStart",
435 base::Time::Now() - base::Time::FromInternalValue(remote_start_time)); 441 base::Time::Now() - base::Time::FromInternalValue(remote_start_time));
436 } 442 }
437 443
438 g_browser_process->PlatformSpecificCommandLineProcessing(command_line); 444 g_browser_process->platform_part()->PlatformSpecificCommandLineProcessing(
445 command_line);
439 446
440 // TODO(erikwright): Consider removing this - AFAIK it is no longer used. 447 // TODO(erikwright): Consider removing this - AFAIK it is no longer used.
441 // Handle the --uninstall-extension startup action. This needs to done here in 448 // Handle the --uninstall-extension startup action. This needs to done here in
442 // the process that is running with the target profile, otherwise the 449 // the process that is running with the target profile, otherwise the
443 // uninstall will fail to unload and remove all components. 450 // uninstall will fail to unload and remove all components.
444 if (command_line.HasSwitch(switches::kUninstallExtension)) { 451 if (command_line.HasSwitch(switches::kUninstallExtension)) {
445 // The uninstall extension switch can't be combined with the profile 452 // The uninstall extension switch can't be combined with the profile
446 // directory switch. 453 // directory switch.
447 DCHECK(!command_line.HasSwitch(switches::kProfileDirectory)); 454 DCHECK(!command_line.HasSwitch(switches::kProfileDirectory));
448 455
(...skipping 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 if (base::win::GetVersion() <= base::win::VERSION_XP) 1813 if (base::win::GetVersion() <= base::win::VERSION_XP)
1807 uma_name += "_XP"; 1814 uma_name += "_XP";
1808 1815
1809 uma_name += "_PreRead_"; 1816 uma_name += "_PreRead_";
1810 uma_name += pre_read_percentage; 1817 uma_name += pre_read_percentage;
1811 AddPreReadHistogramTime(uma_name.c_str(), time); 1818 AddPreReadHistogramTime(uma_name.c_str(), time);
1812 } 1819 }
1813 #endif 1820 #endif
1814 #endif 1821 #endif
1815 } 1822 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_chromeos.cc ('k') | chrome/browser/metro_viewer/metro_viewer_process_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698