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

Side by Side Diff: webkit/plugins/npapi/webplugin_impl.cc

Issue 13219005: Replace string16 with base::string16 in src/webkit (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 "webkit/plugins/npapi/webplugin_impl.h" 5 #include "webkit/plugins/npapi/webplugin_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/linked_ptr.h" 9 #include "base/memory/linked_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 NPObject* WebPluginImpl::scriptableObject() { 275 NPObject* WebPluginImpl::scriptableObject() {
276 if (!delegate_) 276 if (!delegate_)
277 return NULL; 277 return NULL;
278 278
279 return delegate_->GetPluginScriptableObject(); 279 return delegate_->GetPluginScriptableObject();
280 } 280 }
281 281
282 bool WebPluginImpl::getFormValue(WebKit::WebString& value) { 282 bool WebPluginImpl::getFormValue(WebKit::WebString& value) {
283 if (!delegate_) 283 if (!delegate_)
284 return false; 284 return false;
285 string16 form_value; 285 base::string16 form_value;
286 if (!delegate_->GetFormValue(&form_value)) 286 if (!delegate_->GetFormValue(&form_value))
287 return false; 287 return false;
288 value = form_value; 288 value = form_value;
289 return true; 289 return true;
290 } 290 }
291 291
292 void WebPluginImpl::paint(WebCanvas* canvas, const WebRect& paint_rect) { 292 void WebPluginImpl::paint(WebCanvas* canvas, const WebRect& paint_rect) {
293 if (!delegate_ || !container_) 293 if (!delegate_ || !container_)
294 return; 294 return;
295 295
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 webframe_->setReferrerForRequest(*request, plugin_url_); 1368 webframe_->setReferrerForRequest(*request, plugin_url_);
1369 break; 1369 break;
1370 1370
1371 default: 1371 default:
1372 break; 1372 break;
1373 } 1373 }
1374 } 1374 }
1375 1375
1376 } // namespace npapi 1376 } // namespace npapi
1377 } // namespace webkit 1377 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698