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

Side by Side Diff: chrome/browser/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/setup_flow.h" 5 #include "chrome/browser/remoting/setup_flow.h"
6 6
7 #include "app/gfx/font_util.h" 7 #include "app/gfx/font_util.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 148 }
149 149
150 std::string SetupFlow::GetDialogArgs() const { 150 std::string SetupFlow::GetDialogArgs() const {
151 return dialog_start_args_; 151 return dialog_start_args_;
152 } 152 }
153 153
154 void SetupFlow::OnCloseContents(TabContents* source, 154 void SetupFlow::OnCloseContents(TabContents* source,
155 bool* out_close_dialog) { 155 bool* out_close_dialog) {
156 } 156 }
157 157
158 std::wstring SetupFlow::GetDialogTitle() const { 158 std::wstring SetupFlow::GetDialogTitle() const {
159 return l10n_util::GetString(IDS_REMOTING_SETUP_DIALOG_TITLE); 159 return UTF16ToWideHack(
160 l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_DIALOG_TITLE));
160 } 161 }
161 162
162 bool SetupFlow::IsDialogModal() const { 163 bool SetupFlow::IsDialogModal() const {
163 return false; 164 return false;
164 } 165 }
165 166
166 bool SetupFlow::ShouldShowDialogTitle() const { 167 bool SetupFlow::ShouldShowDialogTitle() const {
167 return true; 168 return true;
168 } 169 }
169 170
(...skipping 15 matching lines...) Expand all
185 void SetupFlow::StartCurrentStep() { 186 void SetupFlow::StartCurrentStep() {
186 current_step_->Start(this, NewCallback(this, &SetupFlow::OnStepDone)); 187 current_step_->Start(this, NewCallback(this, &SetupFlow::OnStepDone));
187 } 188 }
188 189
189 void SetupFlow::OnStepDone() { 190 void SetupFlow::OnStepDone() {
190 current_step_.reset(current_step_->GetNextStep()); 191 current_step_.reset(current_step_->GetNextStep());
191 StartCurrentStep(); 192 StartCurrentStep();
192 } 193 }
193 194
194 } // namespace remoting 195 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698