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

Unified Diff: chrome/browser/chromeos/login/webui_login_display_host.cc

Issue 7302015: A keyboard widget that manages itself (the animation and all that). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove touch-login-view Created 9 years, 5 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/webui_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
index 06cd45a2d8643805cffcafc1b11bce8578f2d055..2c8fa60e6d4a46ad58f0c2253efe81a2edcf2ee7 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -7,7 +7,6 @@
#include "chrome/browser/chromeos/login/oobe_display.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
#include "chrome/browser/chromeos/login/webui_login_view.h"
-#include "chrome/browser/chromeos/login/touch_login_view.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "views/widget/widget.h"
@@ -88,11 +87,7 @@ void WebUILoginDisplayHost::LoadURL(const GURL& url) {
login_window_ = new views::Widget;
login_window_->Init(params);
-#if defined(TOUCH_UI)
- login_view_ = new TouchLoginView();
-#else
login_view_ = new WebUILoginView();
-#endif
login_view_->Init();
login_window_->SetContentsView(login_view_);

Powered by Google App Engine
This is Rietveld 408576698