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

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

Issue 7351003: Clean up users of a deprecated base::LaunchApp API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win-only 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 | « base/process_util.h ('k') | chrome/browser/browser_main_win.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) 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 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 } 919 }
920 920
921 if (!new_user_data_dir.empty()) { 921 if (!new_user_data_dir.empty()) {
922 // Because of the way CommandLine parses, it's sufficient to append a new 922 // Because of the way CommandLine parses, it's sufficient to append a new
923 // --user-data-dir switch. The last flag of the same name wins. 923 // --user-data-dir switch. The last flag of the same name wins.
924 // TODO(tc): It would be nice to remove the flag we don't want, but that 924 // TODO(tc): It would be nice to remove the flag we don't want, but that
925 // sounds risky if we parse differently than CommandLineToArgvW. 925 // sounds risky if we parse differently than CommandLineToArgvW.
926 CommandLine new_command_line = parameters.command_line_; 926 CommandLine new_command_line = parameters.command_line_;
927 new_command_line.AppendSwitchPath(switches::kUserDataDir, 927 new_command_line.AppendSwitchPath(switches::kUserDataDir,
928 new_user_data_dir); 928 new_user_data_dir);
929 base::LaunchApp(new_command_line, false, false, NULL); 929 base::LaunchProcess(new_command_line, base::LaunchOptions());
930 } 930 }
931 #else 931 #else
932 // TODO(port): fix this. See comments near the definition of 932 // TODO(port): fix this. See comments near the definition of
933 // user_data_dir. It is better to CHECK-fail here than it is to 933 // user_data_dir. It is better to CHECK-fail here than it is to
934 // silently exit because of missing code in the above test. 934 // silently exit because of missing code in the above test.
935 CHECK(profile) << "Cannot get default profile."; 935 CHECK(profile) << "Cannot get default profile.";
936 #endif 936 #endif
937 937
938 return NULL; 938 return NULL;
939 } 939 }
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
2086 #if defined(OS_CHROMEOS) 2086 #if defined(OS_CHROMEOS)
2087 // To be precise, logout (browser shutdown) is not yet done, but the 2087 // To be precise, logout (browser shutdown) is not yet done, but the
2088 // remaining work is negligible, hence we say LogoutDone here. 2088 // remaining work is negligible, hence we say LogoutDone here.
2089 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2089 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2090 false); 2090 false);
2091 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2091 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2092 #endif 2092 #endif
2093 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2093 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2094 return result_code; 2094 return result_code;
2095 } 2095 }
OLDNEW
« no previous file with comments | « base/process_util.h ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698