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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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) 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/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 localized_strings->SetString("stringPassword", 646 localized_strings->SetString("stringPassword",
647 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_PASSWORD)); 647 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_PASSWORD));
648 localized_strings->SetString("stringSignIn", 648 localized_strings->SetString("stringSignIn",
649 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_SIGNIN)); 649 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_SIGNIN));
650 localized_strings->SetString("stringError", 650 localized_strings->SetString("stringError",
651 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_ERROR)); 651 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_ERROR));
652 params.Set("localizedStrings", localized_strings); 652 params.Set("localizedStrings", localized_strings);
653 } 653 }
654 654
655 params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url()); 655 params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url());
656 const CommandLine* command_line = CommandLine::ForCurrentProcess();
657 if (command_line->HasSwitch(switches::kGaiaUrlPath)) {
658 params.SetString("gaiaUrlPath",
659 command_line->GetSwitchValueASCII(switches::kGaiaUrlPath));
660 }
656 661
657 // Test automation data: 662 // Test automation data:
658 const CommandLine* command_line = CommandLine::ForCurrentProcess();
659 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { 663 if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
660 if (!test_user_.empty()) { 664 if (!test_user_.empty()) {
661 params.SetString("test_email", test_user_); 665 params.SetString("test_email", test_user_);
662 test_user_.clear(); 666 test_user_.clear();
663 } 667 }
664 if (!test_pass_.empty()) { 668 if (!test_pass_.empty()) {
665 params.SetString("test_password", test_pass_); 669 params.SetString("test_password", test_pass_);
666 test_pass_.clear(); 670 test_pass_.clear();
667 } 671 }
668 } 672 }
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 !dns_clear_task_running_ && 1054 !dns_clear_task_running_ &&
1051 network_state_informer_->is_online()) { 1055 network_state_informer_->is_online()) {
1052 gaia_silent_load_ = true; 1056 gaia_silent_load_ = true;
1053 gaia_silent_load_network_ = 1057 gaia_silent_load_network_ =
1054 network_state_informer_->active_network_service_path(); 1058 network_state_informer_->active_network_service_path();
1055 LoadAuthExtension(true, true, false); 1059 LoadAuthExtension(true, true, false);
1056 } 1060 }
1057 } 1061 }
1058 1062
1059 } // namespace chromeos 1063 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698