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

Side by Side Diff: chrome/browser/remoting/remoting_setup_flow.cc

Issue 6044006: Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 #include "chrome/browser/remoting/remoting_setup_flow.h" 5 #include "chrome/browser/remoting/remoting_setup_flow.h"
6 6
7 #include "app/gfx/font_util.h" 7 #include "app/gfx/font_util.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/singleton.h" 9 #include "base/singleton.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 158 }
159 159
160 std::string RemotingSetupFlow::GetDialogArgs() const { 160 std::string RemotingSetupFlow::GetDialogArgs() const {
161 return dialog_start_args_; 161 return dialog_start_args_;
162 } 162 }
163 163
164 void RemotingSetupFlow::OnCloseContents(TabContents* source, 164 void RemotingSetupFlow::OnCloseContents(TabContents* source,
165 bool* out_close_dialog) { 165 bool* out_close_dialog) {
166 } 166 }
167 167
168 std::wstring RemotingSetupFlow::GetDialogTitle() const { 168 std::wstring RemotingSetupFlow::GetDialogTitle() const {
169 return l10n_util::GetString(IDS_REMOTING_SETUP_DIALOG_TITLE); 169 return UTF16ToWideHack(
170 l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_DIALOG_TITLE));
170 } 171 }
171 172
172 bool RemotingSetupFlow::IsDialogModal() const { 173 bool RemotingSetupFlow::IsDialogModal() const {
173 return true; 174 return true;
174 } 175 }
175 176
176 bool RemotingSetupFlow::ShouldShowDialogTitle() const { 177 bool RemotingSetupFlow::ShouldShowDialogTitle() const {
177 return true; 178 return true;
178 } 179 }
179 180
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 310 }
310 311
311 void RemotingSetupFlow::ExecuteJavascriptInIFrame( 312 void RemotingSetupFlow::ExecuteJavascriptInIFrame(
312 const std::wstring& iframe_xpath, 313 const std::wstring& iframe_xpath,
313 const std::wstring& js) { 314 const std::wstring& js) {
314 if (dom_ui_) { 315 if (dom_ui_) {
315 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); 316 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();
316 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js); 317 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
317 } 318 }
318 } 319 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698