Remove various uses of TOUCH_UI that are no longer needed

This includes:
- Don't try to replace small resources with large ones based on a compile flag.  We'll need a more dynamic mechanism.
- No need to disable the Getting Started Guide
- Anything with TOOLKIT_USES_GTK won't support touch.
- Don't need the screen locker logout hack.  WebUI screen locker now works, and is also about to work on Aura builds.
- Re-enable a bunch of tests which were disabled/flaky in TOUCH_UI builds.
- No need to disable SSL Client certificate selector, we have a WebUI version now.
- TOUCH-specific max tab count is gone, remove hack from test.
- Remove exclusions from chrome_tests.gypi for touch tests that are no longer included in the build.

BUG=105046
TEST=

Review URL: http://codereview.chromium.org/8691005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111945 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 4 insertions, 44 deletions

diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 74ab5af..59eb1dd 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -406,7 +406,6 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
   // TODO(nkostylev): May add login UI implementation callback call.
   if (!ready_for_browser_launch_) {
     // Add the appropriate first-login URL.
-#if !defined(TOUCH_UI)
     PrefService* prefs = g_browser_process->local_state();
     const std::string current_locale =
         StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
@@ -421,7 +420,6 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
       start_url = base::StringPrintf(url, current_locale.c_str());
     }
     CommandLine::ForCurrentProcess()->AppendArg(start_url);
-#endif
 
     ServicesCustomizationDocument* customization =
       ServicesCustomizationDocument::GetInstance();
diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc
index f526dd9..91e11d1 100644
--- a/chrome/browser/chromeos/login/message_bubble.cc
+++ b/chrome/browser/chromeos/login/message_bubble.cc
@@ -177,7 +177,7 @@ MessageBubble* MessageBubble::ShowNoGrab(
   return bubble;
 }
 
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
 // TODO(saintlou): Unclear if we need this for the !gtk case.
 void MessageBubble::OnActiveChanged() {
   if (parent_ && IsActive()) {
@@ -198,7 +198,7 @@ void MessageBubble::Close() {
   Bubble::Close();
 }
 
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
 gboolean MessageBubble::OnButtonPress(GtkWidget* widget,
                                       GdkEventButton* event) {
   NativeWidgetGtk::OnButtonPress(widget, event);
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index ecdf775..7d57251 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -77,7 +77,7 @@ class MessageBubble : public Bubble,
   // Overridden from NativeWidgetGtk/NativeWidgetViews.
   virtual void Close() OVERRIDE;
 
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
   virtual gboolean OnButtonPress(GtkWidget* widget,
                                  GdkEventButton* event) OVERRIDE;
 #endif
@@ -92,7 +92,7 @@ class MessageBubble : public Bubble,
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
   // Overridden from NativeWidgetGtk.
   virtual void OnActiveChanged() OVERRIDE;
   virtual void SetMouseCapture() OVERRIDE;
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index c16da71..6e13b98 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -356,18 +356,7 @@ void ScreenLocker::Show() {
     VLOG(1) << "Show: Locking screen";
     ScreenLocker* locker =
         new ScreenLocker(UserManager::Get()->logged_in_user());
-#if defined(TOUCH_UI)
-    // The views screen locker does not reliably work on TOUCH_UI builds. In
-    // order to effectively "lock" the screen we will sign out the user for now.
-    // TODO(flackr): Implement lock screen in WebUI and remove this hack
-    // (crbug.com/105267).
-    if (ScreenLocker::UseWebUILockScreen())
-      locker->Init();
-    else
-      locker->Signout();
-#else
     locker->Init();
-#endif
   } else {
     // PowerManager re-sends lock screen signal if it doesn't
     // receive the response within timeout. Just send complete
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index 4e3034c..6740bcf 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -503,15 +503,6 @@ class InputEventObserver : public MessageLoopForUI::Observer {
         activated_(false) {
   }
 
-#if defined(TOUCH_UI)
-  virtual base::EventStatus WillProcessEvent(
-      const base::NativeEvent& event) OVERRIDE {
-    return base::EVENT_CONTINUE;
-  }
-
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
-  }
-#else
   virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
     if ((event->type == GDK_KEY_PRESS ||
          event->type == GDK_BUTTON_PRESS ||
@@ -530,7 +521,6 @@ class InputEventObserver : public MessageLoopForUI::Observer {
 
   virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
   }
-#endif
 
  private:
   chromeos::ScreenLocker* screen_locker_;
@@ -553,15 +543,6 @@ class LockerInputEventObserver : public MessageLoopForUI::Observer {
                    &LockerInputEventObserver::StartScreenSaver)) {
   }
 
-#if defined(TOUCH_UI)
-  virtual base::EventStatus WillProcessEvent(
-      const base::NativeEvent& event) OVERRIDE {
-    return base::EVENT_CONTINUE;
-  }
-
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
-  }
-#else
   virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
     if ((event->type == GDK_KEY_PRESS ||
          event->type == GDK_BUTTON_PRESS ||
@@ -573,7 +554,6 @@ class LockerInputEventObserver : public MessageLoopForUI::Observer {
 
   virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
   }
-#endif
 
  private:
   void StartScreenSaver() {
@@ -906,14 +886,12 @@ void ScreenLockerViews::ShowErrorBubble(
       UTF16ToWide(string16()),  // TODO(nkostylev): Add help link.
       this);
 
-#if !defined(TOUCH_UI)
   if (mouse_event_relay_.get())
     MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
   mouse_event_relay_.reset(
       new MouseEventRelay(lock_widget_->GetNativeView()->window,
                           error_info_->GetNativeView()->window));
   MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get());
-#endif
 }
 
 bool ScreenLockerViews::AcceleratorPressed(
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 4e03888..1da9cfc 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -332,16 +332,11 @@ void WebUILoginView::InitStatusArea() {
       width() - widget_size.width() - kStatusAreaCornerPadding;
   gfx::Rect widget_bounds(widget_x, kStatusAreaCornerPadding,
                           widget_size.width(), widget_size.height());
-#if defined(TOUCH_UI)
-  views::Widget::InitParams widget_params(
-      views::Widget::InitParams::TYPE_CONTROL);
-#else
   // TODO(nkostylev|oshima): Make status area in the same window as
   // |webui_login_| once RenderWidgetHostViewViews and compositor are
   // ready.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-#endif
   widget_params.bounds = widget_bounds;
   widget_params.transparent = true;
   widget_params.parent_widget = login_window_;