diff options
| author | jhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 18:25:45 +0000 |
|---|---|---|
| committer | jhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 18:25:45 +0000 |
| commit | d55194ca076df03e149b904b12f83baadad85a8e (patch) | |
| tree | 5732658491a778651e02fcc17beb8655a1a7edf1 /chrome_frame | |
| parent | 5bc8fe91607f20f2d43dc461ca188dd07b55d435 (diff) | |
| download | chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.zip chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.gz chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.bz2 | |
win: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/830002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/com_message_event.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/np_event_listener.cc | 7 | ||||
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/chrome_frame/com_message_event.cc b/chrome_frame/com_message_event.cc index 24bbdfb..5ec982a 100644 --- a/chrome_frame/com_message_event.cc +++ b/chrome_frame/com_message_event.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" ComMessageEvent::ComMessageEvent() { } diff --git a/chrome_frame/np_event_listener.cc b/chrome_frame/np_event_listener.cc index ff5479a..3b477aa 100644 --- a/chrome_frame/np_event_listener.cc +++ b/chrome_frame/np_event_listener.cc @@ -5,15 +5,14 @@ #include "chrome_frame/np_event_listener.h" #include "base/string_util.h" - +#include "base/utf_string_conversions.h" +#include "chrome_frame/scoped_ns_ptr_win.h" +#include "chrome_frame/ns_associate_iid_win.h" #include "third_party/xulrunner-sdk/win/include/string/nsEmbedString.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMElement.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEventTarget.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEvent.h" -#include "chrome_frame/scoped_ns_ptr_win.h" -#include "chrome_frame/ns_associate_iid_win.h" - ASSOCIATE_IID(NS_IDOMELEMENT_IID_STR, nsIDOMElement); ASSOCIATE_IID(NS_IDOMNODE_IID_STR, nsIDOMNode); ASSOCIATE_IID(NS_IDOMEVENTTARGET_IID_STR, nsIDOMEventTarget); diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 79c4eff..c2f0abb 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -15,7 +15,7 @@ #include "base/registry.h" // to find IE and firefox #include "base/scoped_handle.h" #include "base/scoped_comptr_win.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/utils.h" @@ -427,7 +427,7 @@ _ATL_FUNC_INFO WebBrowserEventSink::kFileDownloadInfo = { // WebBrowserEventSink member defines void WebBrowserEventSink::Attach(IDispatch* browser_disp) { EXPECT_TRUE(NULL != browser_disp); - if(browser_disp) { + if (browser_disp) { EXPECT_HRESULT_SUCCEEDED(web_browser2_.QueryFrom(browser_disp)); EXPECT_TRUE(S_OK == DispEventAdvise(web_browser2_, &DIID_DWebBrowserEvents2)); diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 04bac77..560d4dc 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -17,6 +17,7 @@ #include "base/scoped_variant_win.h" #include "base/string_util.h" #include "base/thread_local.h" +#include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/chrome_frame_distribution.h" #include "chrome_frame/extra_system_apis.h" |