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

Side by Side Diff: chrome/app/chrome_main.cc

Issue 2937133002: Launch browser when --memlog is specified on the command line. (Closed)
Patch Set: Fix Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('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) 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/app/chrome_main_delegate.h" 10 #include "chrome/app/chrome_main_delegate.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) 100 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
101 if (command_line->HasSwitch(switches::kHeadless)) { 101 if (command_line->HasSwitch(switches::kHeadless)) {
102 #if defined(OS_MACOSX) 102 #if defined(OS_MACOSX)
103 SetUpBundleOverrides(); 103 SetUpBundleOverrides();
104 #endif 104 #endif
105 return headless::HeadlessShellMain(params); 105 return headless::HeadlessShellMain(params);
106 } 106 }
107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) 107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
108 108
109 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) 109 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
110 if (command_line->GetSwitchValueASCII(switches::kProcessType) == 110 if (command_line->HasSwitch(switches::kMemlog))
111 "profiling") {
112 return profiling::ProfilingMain(*command_line); 111 return profiling::ProfilingMain(*command_line);
113 }
114 #endif // ENABLE_OOP_HEAP_PROFILING 112 #endif // ENABLE_OOP_HEAP_PROFILING
115 113
116 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 114 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
117 if (service_manager::ServiceManagerIsRemote()) 115 if (service_manager::ServiceManagerIsRemote())
118 params.env_mode = aura::Env::Mode::MUS; 116 params.env_mode = aura::Env::Mode::MUS;
119 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 117 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
120 118
121 int rv = content::ContentMain(params); 119 int rv = content::ContentMain(params);
122 120
123 #if defined(OS_WIN) 121 #if defined(OS_WIN)
124 base::win::SetShouldCrashOnProcessDetach(false); 122 base::win::SetShouldCrashOnProcessDetach(false);
125 #endif 123 #endif
126 124
127 return rv; 125 return rv;
128 } 126 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698