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

Unified Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 8436002: [cros] Remove Views implementation for login/OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/automation/automation_provider_observers.h ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index d74d81d94a0c5d9f2cc377a19ca35bbfcacc0489..8cbd29601733452ee6b7f7d0339678d886b31468 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -36,7 +36,6 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/views/window.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "net/base/network_change_notifier.h"
#include "policy/policy_constants.h"
@@ -224,11 +223,7 @@ void TestingAutomationProvider::GetLoginInfo(DictionaryValue* args,
const chromeos::ScreenLocker* screen_locker =
chromeos::ScreenLocker::default_screen_locker();
- return_value->SetString(
- "login_ui_type",
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)?
- "webui": "nativeui");
-
+ return_value->SetString("login_ui_type", "webui");
return_value->SetBoolean("is_owner", user_manager->current_user_is_owner());
return_value->SetBoolean("is_logged_in", user_manager->user_is_logged_in());
return_value->SetBoolean("is_screen_locked", screen_locker);
@@ -277,16 +272,10 @@ void TestingAutomationProvider::Login(DictionaryValue* args,
// Set up an observer (it will delete itself).
new LoginObserver(controller, this, reply_message);
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
- // WebUI login.
- chromeos::WebUILoginDisplay* webui_login_display =
- static_cast<chromeos::WebUILoginDisplay*>(controller->login_display());
- webui_login_display->ShowSigninScreenForCreds(username, password);
- } else {
- // Native UI login.
- controller->login_display()->SelectPod(0);
- controller->Login(username, password);
- }
+ // WebUI login.
+ chromeos::WebUILoginDisplay* webui_login_display =
+ static_cast<chromeos::WebUILoginDisplay*>(controller->login_display());
+ webui_login_display->ShowSigninScreenForCreds(username, password);
}
void TestingAutomationProvider::LockScreen(DictionaryValue* args,
« no previous file with comments | « chrome/browser/automation/automation_provider_observers.h ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698