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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 327793005: Change google_util::AppendGoogleLocaleParam to take in the application locale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ChromeOS fix Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/google/google_util.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 // 305 //
306 306
307 void ExistingUserController::CancelPasswordChangedFlow() { 307 void ExistingUserController::CancelPasswordChangedFlow() {
308 login_performer_.reset(NULL); 308 login_performer_.reset(NULL);
309 login_display_->SetUIEnabled(true); 309 login_display_->SetUIEnabled(true);
310 StartPublicSessionAutoLoginTimer(); 310 StartPublicSessionAutoLoginTimer();
311 } 311 }
312 312
313 void ExistingUserController::CreateAccount() { 313 void ExistingUserController::CreateAccount() {
314 content::RecordAction(base::UserMetricsAction("Login.CreateAccount")); 314 content::RecordAction(base::UserMetricsAction("Login.CreateAccount"));
315 guest_mode_url_ = 315 guest_mode_url_ = google_util::AppendGoogleLocaleParam(
316 google_util::AppendGoogleLocaleParam(GURL(kCreateAccountURL)); 316 GURL(kCreateAccountURL), g_browser_process->GetApplicationLocale());
317 LoginAsGuest(); 317 LoginAsGuest();
318 } 318 }
319 319
320 void ExistingUserController::CompleteLogin(const UserContext& user_context) { 320 void ExistingUserController::CompleteLogin(const UserContext& user_context) {
321 login_display_->set_signin_completed(true); 321 login_display_->set_signin_completed(true);
322 if (!host_) { 322 if (!host_) {
323 // Complete login event was generated already from UI. Ignore notification. 323 // Complete login event was generated already from UI. Ignore notification.
324 return; 324 return;
325 } 325 }
326 326
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 } 1117 }
1118 1118
1119 void ExistingUserController::SendAccessibilityAlert( 1119 void ExistingUserController::SendAccessibilityAlert(
1120 const std::string& alert_text) { 1120 const std::string& alert_text) {
1121 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); 1121 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text);
1122 SendControlAccessibilityNotification( 1122 SendControlAccessibilityNotification(
1123 ui::AX_EVENT_VALUE_CHANGED, &event); 1123 ui::AX_EVENT_VALUE_CHANGED, &event);
1124 } 1124 }
1125 1125
1126 } // namespace chromeos 1126 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/google/google_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698