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

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

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 ShowGaiaSuccessAndSettingUp(); 202 ShowGaiaSuccessAndSettingUp();
203 203
204 // Save the sync token. 204 // Save the sync token.
205 sync_token_ = auth_token; 205 sync_token_ = auth_token;
206 authenticator_.reset(); 206 authenticator_.reset();
207 207
208 // And then launch the service process if it has not started yet. 208 // And then launch the service process if it has not started yet.
209 // If we have already connected to the service process then submit the tokens 209 // If we have already connected to the service process then submit the tokens
210 // to it to register the host. 210 // to it to register the host.
211 process_control_ = 211 process_control_ =
212 ServiceProcessControlManager::instance()->GetProcessControl(profile_); 212 ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
213 213
214 if (process_control_->is_connected()) { 214 if (process_control_->is_connected()) {
215 // TODO(hclam): Need to figure out what to do when the service process is 215 // TODO(hclam): Need to figure out what to do when the service process is
216 // already connected. 216 // already connected.
217 } else { 217 } else {
218 #if defined(OS_WIN) 218 #if defined(OS_WIN)
219 // TODO(hclam): This call only works on Windows. I need to make it work 219 // TODO(hclam): This call only works on Windows. I need to make it work
220 // on other platforms. 220 // on other platforms.
221 service_process_helper_ = new RemotingServiceProcessHelper(this); 221 service_process_helper_ = new RemotingServiceProcessHelper(this);
222 Task* process_launched_task = 222 Task* process_launched_task =
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 309 }
310 310
311 void RemotingSetupFlow::ExecuteJavascriptInIFrame( 311 void RemotingSetupFlow::ExecuteJavascriptInIFrame(
312 const std::wstring& iframe_xpath, 312 const std::wstring& iframe_xpath,
313 const std::wstring& js) { 313 const std::wstring& js) {
314 if (dom_ui_) { 314 if (dom_ui_) {
315 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); 315 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();
316 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js); 316 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
317 } 317 }
318 } 318 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698