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

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

Issue 46039: Removed unneeded includes of base/scoped_ptr.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/views/link.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 #include <atlbase.h> 1 #include <atlbase.h>
2 #include <shlwapi.h> 2 #include <shlwapi.h>
3 3
4 #include <map> 4 #include <map>
5 5
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/scoped_ptr.h"
7 #include "base/string_util.h" 8 #include "base/string_util.h"
8 9
9 #include "installer_util_strings.h" 10 #include "installer_util_strings.h"
10 11
11 namespace { 12 namespace {
12 13
13 // Gets the language from the OS. If we're unable to get the system language, 14 // Gets the language from the OS. If we're unable to get the system language,
14 // defaults to en-us. 15 // defaults to en-us.
15 std::wstring GetSystemLanguage() { 16 std::wstring GetSystemLanguage() {
16 static std::wstring language; 17 static std::wstring language;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 DWORD count = url_path.size() * 3; 228 DWORD count = url_path.size() * 3;
228 scoped_ptr<wchar_t> url_canon(new wchar_t[count]); 229 scoped_ptr<wchar_t> url_canon(new wchar_t[count]);
229 HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(), 230 HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(),
230 &count, URL_ESCAPE_UNSAFE); 231 &count, URL_ESCAPE_UNSAFE);
231 if (SUCCEEDED(hr)) 232 if (SUCCEEDED(hr))
232 return std::wstring(url_canon.get()); 233 return std::wstring(url_canon.get());
233 return url_path; 234 return url_path;
234 } 235 }
235 236
236 } // namespace installer_util 237 } // namespace installer_util
OLDNEW
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/views/link.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698