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

Side by Side Diff: chrome/installer/util/google_update_util.cc

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 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/installer/util/google_update_util.h" 5 #include "chrome/installer/util/google_update_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/environment.h" 13 #include "base/environment.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/process_util.h" 17 #include "base/process_util.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "base/time.h" 20 #include "base/time.h"
21 #include "base/win/registry.h" 21 #include "base/win/registry.h"
22 #include "base/win/scoped_handle.h" 22 #include "base/win/scoped_handle.h"
23 #include "chrome/installer/launcher_support/chrome_launcher_support.h" 23 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
24 #include "chrome/installer/util/google_update_constants.h" 24 #include "chrome/installer/util/google_update_constants.h"
25 #include "chrome/installer/util/google_update_settings.h" 25 #include "chrome/installer/util/google_update_settings.h"
26 26
27 using base::win::RegKey; 27 using base::win::RegKey;
28 28
29 namespace google_update { 29 namespace google_update {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 std::map<std::string, std::string>::const_iterator data_it( 214 std::map<std::string, std::string>::const_iterator data_it(
215 untrusted_data.find(key)); 215 untrusted_data.find(key));
216 if (data_it != untrusted_data.end()) 216 if (data_it != untrusted_data.end())
217 return data_it->second; 217 return data_it->second;
218 } 218 }
219 219
220 return std::string(); 220 return std::string();
221 } 221 }
222 222
223 } // namespace google_update 223 } // namespace google_update
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698