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

Side by Side Diff: chrome_frame/utils.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 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
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | media/filters/file_data_source.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <htiframe.h> 5 #include <htiframe.h>
6 #include <mshtml.h> 6 #include <mshtml.h>
7 #include <shlobj.h> 7 #include <shlobj.h>
8 #include <wininet.h> 8 #include <wininet.h>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/file_version_info.h" 11 #include "base/file_version_info.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/registry.h" 15 #include "base/registry.h"
16 #include "base/scoped_comptr_win.h" 16 #include "base/scoped_comptr_win.h"
17 #include "base/scoped_variant_win.h" 17 #include "base/scoped_variant_win.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/thread_local.h" 19 #include "base/thread_local.h"
20 #include "base/utf_string_conversions.h"
20 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
21 #include "chrome/installer/util/chrome_frame_distribution.h" 22 #include "chrome/installer/util/chrome_frame_distribution.h"
22 #include "chrome_frame/extra_system_apis.h" 23 #include "chrome_frame/extra_system_apis.h"
23 #include "chrome_frame/html_utils.h" 24 #include "chrome_frame/html_utils.h"
24 #include "chrome_frame/utils.h" 25 #include "chrome_frame/utils.h"
25 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
26 #include "grit/chrome_frame_resources.h" 27 #include "grit/chrome_frame_resources.h"
27 28
28 // Note that these values are all lower case and are compared to 29 // Note that these values are all lower case and are compared to
29 // lower-case-transformed values. 30 // lower-case-transformed values.
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 866
866 HWND parent = GetParent(window); 867 HWND parent = GetParent(window);
867 return !parent || (parent == GetDesktopWindow()); 868 return !parent || (parent == GetDesktopWindow());
868 } 869 }
869 870
870 std::wstring GuidToString(const GUID& guid) { 871 std::wstring GuidToString(const GUID& guid) {
871 std::wstring ret; 872 std::wstring ret;
872 ::StringFromGUID2(guid, WriteInto(&ret, 39), 39); 873 ::StringFromGUID2(guid, WriteInto(&ret, 39), 39);
873 return ret; 874 return ret;
874 } 875 }
OLDNEW
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698