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

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

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 446
447 counter->AddTime(time); 447 counter->AddTime(time);
448 } 448 }
449 449
450 bool ProcessSingletonNotificationCallback(const CommandLine& command_line, 450 bool ProcessSingletonNotificationCallback(const CommandLine& command_line,
451 const FilePath& current_directory) { 451 const FilePath& current_directory) {
452 // Drop the request if the browser process is already in shutdown path. 452 // Drop the request if the browser process is already in shutdown path.
453 if (!g_browser_process || g_browser_process->IsShuttingDown()) 453 if (!g_browser_process || g_browser_process->IsShuttingDown())
454 return false; 454 return false;
455 455
456 g_browser_process->PlatformSpecificCommandLineProcessing(command_line);
457
456 // TODO(erikwright): Consider removing this - AFAIK it is no longer used. 458 // TODO(erikwright): Consider removing this - AFAIK it is no longer used.
457 // Handle the --uninstall-extension startup action. This needs to done here 459 // Handle the --uninstall-extension startup action. This needs to done here
458 // in the process that is running with the target profile, otherwise the 460 // in the process that is running with the target profile, otherwise the
459 // uninstall will fail to unload and remove all components. 461 // uninstall will fail to unload and remove all components.
460 if (command_line.HasSwitch(switches::kUninstallExtension)) { 462 if (command_line.HasSwitch(switches::kUninstallExtension)) {
461 // The uninstall extension switch can't be combined with the profile 463 // The uninstall extension switch can't be combined with the profile
462 // directory switch. 464 // directory switch.
463 DCHECK(!command_line.HasSwitch(switches::kProfileDirectory)); 465 DCHECK(!command_line.HasSwitch(switches::kProfileDirectory));
464 466
465 Profile* profile = ProfileManager::GetLastUsedProfile(); 467 Profile* profile = ProfileManager::GetLastUsedProfile();
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1717 if (base::win::GetVersion() <= base::win::VERSION_XP) 1719 if (base::win::GetVersion() <= base::win::VERSION_XP)
1718 uma_name += "_XP"; 1720 uma_name += "_XP";
1719 1721
1720 uma_name += "_PreRead_"; 1722 uma_name += "_PreRead_";
1721 uma_name += pre_read_percentage; 1723 uma_name += pre_read_percentage;
1722 AddPreReadHistogramTime(uma_name.c_str(), time); 1724 AddPreReadHistogramTime(uma_name.c_str(), time);
1723 } 1725 }
1724 #endif 1726 #endif
1725 #endif 1727 #endif
1726 } 1728 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698