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

Side by Side Diff: chrome/browser/debugger/debugger_remote_service.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // This file contains implementations of the DebuggerRemoteService methods, 5 // This file contains implementations of the DebuggerRemoteService methods,
6 // defines DebuggerRemoteService and DebuggerRemoteServiceCommand constants. 6 // defines DebuggerRemoteService and DebuggerRemoteServiceCommand constants.
7 7
8 #include "chrome/browser/debugger/debugger_remote_service.h" 8 #include "chrome/browser/debugger/debugger_remote_service.h"
9 9
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 return true; 323 return true;
324 } 324 }
325 RenderViewHost* render_view_host = tab_contents->render_view_host(); 325 RenderViewHost* render_view_host = tab_contents->render_view_host();
326 if (render_view_host == NULL) { 326 if (render_view_host == NULL) {
327 // No RenderViewHost 327 // No RenderViewHost
328 response->SetInteger(kResultKey, RESULT_UNKNOWN_TAB); 328 response->SetInteger(kResultKey, RESULT_UNKNOWN_TAB);
329 return true; 329 return true;
330 } 330 }
331 std::string javascript; 331 std::string javascript;
332 content->GetString(kDataKey, &javascript); 332 content->GetString(kDataKey, &javascript);
333 render_view_host->ExecuteJavascriptInWebFrame(std::wstring(), 333 render_view_host->ExecuteJavascriptInWebFrame(string16(),
334 UTF8ToWide(javascript)); 334 UTF8ToUTF16(javascript));
335 return false; 335 return false;
336 } 336 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698