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

Side by Side Diff: chrome_frame/np_event_listener.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/com_message_event.cc ('k') | chrome_frame/test/chrome_frame_test_utils.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 "chrome_frame/np_event_listener.h" 5 #include "chrome_frame/np_event_listener.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 8 #include "base/utf_string_conversions.h"
9 #include "chrome_frame/scoped_ns_ptr_win.h"
10 #include "chrome_frame/ns_associate_iid_win.h"
9 #include "third_party/xulrunner-sdk/win/include/string/nsEmbedString.h" 11 #include "third_party/xulrunner-sdk/win/include/string/nsEmbedString.h"
10 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMElement.h" 12 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMElement.h"
11 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEventTarget.h" 13 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEventTarget.h"
12 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEvent.h" 14 #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEvent.h"
13 15
14 #include "chrome_frame/scoped_ns_ptr_win.h"
15 #include "chrome_frame/ns_associate_iid_win.h"
16
17 ASSOCIATE_IID(NS_IDOMELEMENT_IID_STR, nsIDOMElement); 16 ASSOCIATE_IID(NS_IDOMELEMENT_IID_STR, nsIDOMElement);
18 ASSOCIATE_IID(NS_IDOMNODE_IID_STR, nsIDOMNode); 17 ASSOCIATE_IID(NS_IDOMNODE_IID_STR, nsIDOMNode);
19 ASSOCIATE_IID(NS_IDOMEVENTTARGET_IID_STR, nsIDOMEventTarget); 18 ASSOCIATE_IID(NS_IDOMEVENTTARGET_IID_STR, nsIDOMEventTarget);
20 ASSOCIATE_IID(NS_IDOMEVENTLISTENER_IID_STR, nsIDOMEventListener); 19 ASSOCIATE_IID(NS_IDOMEVENTLISTENER_IID_STR, nsIDOMEventListener);
21 20
22 DomEventListener::DomEventListener(NpEventDelegate* delegate) 21 DomEventListener::DomEventListener(NpEventDelegate* delegate)
23 : NpEventListenerBase<DomEventListener>(delegate) { 22 : NpEventListenerBase<DomEventListener>(delegate) {
24 } 23 }
25 24
26 DomEventListener::~DomEventListener() { 25 DomEventListener::~DomEventListener() {
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 COMPILE_ASSERT(arraysize(identifier_names) == arraysize(_identifiers), 357 COMPILE_ASSERT(arraysize(identifier_names) == arraysize(_identifiers),
359 mismatched_array_size); 358 mismatched_array_size);
360 npapi::GetStringIdentifiers(identifier_names, IDENTIFIER_COUNT, 359 npapi::GetStringIdentifiers(identifier_names, IDENTIFIER_COUNT,
361 _identifiers); 360 _identifiers);
362 for (int i = 0; i < IDENTIFIER_COUNT; ++i) { 361 for (int i = 0; i < IDENTIFIER_COUNT; ++i) {
363 DCHECK(_identifiers[i] != 0); 362 DCHECK(_identifiers[i] != 0);
364 } 363 }
365 } 364 }
366 return _identifiers; 365 return _identifiers;
367 } 366 }
OLDNEW
« no previous file with comments | « chrome_frame/com_message_event.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698