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

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 12087091: Move string tokenizer to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 82519b841b78bcc6d4e9e85d962774798abe454a..d1e9f4210759b20b9f14c45c061293be5992a95c 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -26,7 +26,7 @@
#include "base/posix/eintr_wrapper.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "base/utf_string_conversions.h"
@@ -454,7 +454,7 @@ bool GetDesktopShortcutTemplate(base::Environment* env,
std::string xdg_data_dirs;
if (env->GetVar("XDG_DATA_DIRS", &xdg_data_dirs) &&
!xdg_data_dirs.empty()) {
- StringTokenizer tokenizer(xdg_data_dirs, ":");
+ base::StringTokenizer tokenizer(xdg_data_dirs, ":");
while (tokenizer.GetNext()) {
FilePath data_dir(tokenizer.token());
search_paths.push_back(data_dir);
@@ -583,7 +583,7 @@ std::string GetDesktopFileContents(
if (exec_c_string) {
std::string exec_string(exec_c_string);
g_free(exec_c_string);
- StringTokenizer exec_tokenizer(exec_string, " ");
+ base::StringTokenizer exec_tokenizer(exec_string, " ");
std::string final_path;
while (exec_tokenizer.GetNext() && exec_tokenizer.token() != "%U") {
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698