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

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

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. 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
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_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 IDS_ABOUT_VERSION_OFFICIAL 1129 IDS_ABOUT_VERSION_OFFICIAL
1130 : IDS_ABOUT_VERSION_UNOFFICIAL)); 1130 : IDS_ABOUT_VERSION_UNOFFICIAL));
1131 localized_strings->SetString("user_agent_name", 1131 localized_strings->SetString("user_agent_name",
1132 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_USER_AGENT)); 1132 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_USER_AGENT));
1133 localized_strings->SetString("useragent", webkit_glue::GetUserAgent(GURL())); 1133 localized_strings->SetString("useragent", webkit_glue::GetUserAgent(GURL()));
1134 localized_strings->SetString("command_line_name", 1134 localized_strings->SetString("command_line_name",
1135 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMMAND_LINE)); 1135 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMMAND_LINE));
1136 1136
1137 #if defined(OS_WIN) 1137 #if defined(OS_WIN)
1138 localized_strings->SetString("command_line", 1138 localized_strings->SetString("command_line",
1139 WideToUTF16(CommandLine::ForCurrentProcess()->command_line_string())); 1139 WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString()));
1140 #elif defined(OS_POSIX) 1140 #elif defined(OS_POSIX)
1141 std::string command_line = ""; 1141 std::string command_line = "";
1142 typedef std::vector<std::string> ArgvList; 1142 typedef std::vector<std::string> ArgvList;
1143 const ArgvList& argv = CommandLine::ForCurrentProcess()->argv(); 1143 const ArgvList& argv = CommandLine::ForCurrentProcess()->argv();
1144 for (ArgvList::const_iterator iter = argv.begin(); iter != argv.end(); iter++) 1144 for (ArgvList::const_iterator iter = argv.begin(); iter != argv.end(); iter++)
1145 command_line += " " + *iter; 1145 command_line += " " + *iter;
1146 // TODO(viettrungluu): |command_line| could really have any encoding, whereas 1146 // TODO(viettrungluu): |command_line| could really have any encoding, whereas
1147 // below we assumes it's UTF-8. 1147 // below we assumes it's UTF-8.
1148 localized_strings->SetString("command_line", command_line); 1148 localized_strings->SetString("command_line", command_line);
1149 #endif 1149 #endif
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1520 return false; 1520 return false;
1521 } 1521 }
1522 1522
1523 std::vector<std::string> ChromePaths() { 1523 std::vector<std::string> ChromePaths() {
1524 std::vector<std::string> paths; 1524 std::vector<std::string> paths;
1525 paths.reserve(arraysize(kChromePaths)); 1525 paths.reserve(arraysize(kChromePaths));
1526 for (size_t i = 0; i < arraysize(kChromePaths); i++) 1526 for (size_t i = 0; i < arraysize(kChromePaths); i++)
1527 paths.push_back(kChromePaths[i]); 1527 paths.push_back(kChromePaths[i]);
1528 return paths; 1528 return paths;
1529 } 1529 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698