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

Unified Diff: chrome/browser/chromeos/login/base_login_display_host.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, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/base_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index fe2796a7c13a992a8b94aea1fd552e23533399b1..8d07bc362bcdf832a33c5d49d533896f5845ae57 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -22,14 +22,12 @@
#include "chrome/browser/chromeos/login/language_switch_menu.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/views_login_display_host.h"
#include "chrome/browser/chromeos/login/webui_login_display_host.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/mobile_config.h"
#include "chrome/browser/chromeos/system/timezone_settings.h"
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
@@ -252,11 +250,7 @@ void ShowLoginWizard(const std::string& first_screen_name,
// Under Aura we always use the WebUI.
display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
#else
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
- display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
- } else {
- display_host = new chromeos::ViewsLoginDisplayHost(screen_bounds);
- }
+ display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
#endif
if (show_login_screen && chromeos::CrosLibrary::Get()->EnsureLoaded()) {

Powered by Google App Engine
This is Rietveld 408576698