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

Side by Side Diff: chrome/browser/sync/sync_setup_flow.cc

Issue 8589033: [Sync] Change std::wstring to string16 in SyncSetupFlowHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/sync/sync_setup_flow_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/sync/sync_setup_flow.h" 5 #include "chrome/browser/sync/sync_setup_flow.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 // display the error appropriately (http://crbug.com/92722). 489 // display the error appropriately (http://crbug.com/92722).
490 DictionaryValue args; 490 DictionaryValue args;
491 SyncSetupFlow::GetArgsForGaiaLogin(service_, &args); 491 SyncSetupFlow::GetArgsForGaiaLogin(service_, &args);
492 args.SetBoolean("fatalError", true); 492 args.SetBoolean("fatalError", true);
493 current_state_ = SyncSetupWizard::GAIA_LOGIN; 493 current_state_ = SyncSetupWizard::GAIA_LOGIN;
494 flow_handler_->ShowGaiaLogin(args); 494 flow_handler_->ShowGaiaLogin(args);
495 break; 495 break;
496 } 496 }
497 case SyncSetupWizard::DONE: 497 case SyncSetupWizard::DONE:
498 case SyncSetupWizard::ABORT: 498 case SyncSetupWizard::ABORT:
499 flow_handler_->ShowSetupDone( 499 flow_handler_->ShowSetupDone(service_->GetAuthenticatedUsername());
500 UTF16ToWide(service_->GetAuthenticatedUsername()));
501 break; 500 break;
502 default: 501 default:
503 NOTREACHED() << "Invalid advance state: " << state; 502 NOTREACHED() << "Invalid advance state: " << state;
504 } 503 }
505 } 504 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/sync_setup_flow_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698