Add Windows commandline switch --enable-views-textfield.

ui/views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "grit/ui_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // A wrapper of Textfield to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
 class TestTextfield : public views::Textfield {
  public:
-  TestTextfield()
-      : key_handled_(false),
-        key_received_(false) {
-  }
-
   explicit TestTextfield(StyleFlags style)
       : Textfield(style),
         key_handled_(false),
         key_received_(false) {
   }
 
   virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
     key_received_ = true;
     key_handled_ = views::Textfield::OnKeyPressed(e);
     return key_handled_;
   }
 
   virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE {
     key_received_ = true;
     key_handled_ = views::Textfield::OnKeyReleased(e);
     return key_handled_;
   }
 
   bool key_handled() const { return key_handled_; }
   bool key_received() const { return key_received_; }
 
-  void clear() {
-    key_received_ = key_handled_ = false;
-  }
+  void clear() { key_received_ = key_handled_ = false; }
 
  private:
   bool key_handled_;
   bool key_received_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTextfield);
 };
 
 // A helper class for use with ui::TextInputClient::GetTextFromRange().
 class GetTextHelper {
  public:
-  GetTextHelper() {
-  }
+  GetTextHelper() {}
 
   void set_text(const string16& text) { text_ = text; }
   const string16& text() const { return text_; }
 
  private:
   string16 text_;
 
   DISALLOW_COPY_AND_ASSIGN(GetTextHelper);
 };
 
@@ skipping 37 matching lines @@
     ViewsTestBase::TearDown();
   }
 
   // TextfieldController:
   virtual void ContentsChanged(Textfield* sender,
                                const string16& new_contents) {
     ASSERT_NE(last_contents_, new_contents);
     last_contents_ = new_contents;
   }
 
-  virtual bool HandleKeyEvent(Textfield* sender,
-                              const KeyEvent& key_event) {
-
+  virtual bool HandleKeyEvent(Textfield* sender, const KeyEvent& key_event) {
     // TODO(oshima): figure out how to test the keystroke.
     return false;
   }
 
   virtual void OnBeforeUserAction(Textfield* sender) {
     ++on_before_user_action_;
   }
 
   virtual void OnAfterUserAction(Textfield* sender) {
     ++on_after_user_action_;
   }
 
   void InitTextfield(Textfield::StyleFlags style) {
     InitTextfields(style, 1);
   }
 
   void InitTextfields(Textfield::StyleFlags style, int count) {
+    // Append kEnableViewsTextfield to use NativeTextfieldViews on Windows.
+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    command_line->AppendSwitch(switches::kEnableViewsTextfield);
+
     ASSERT_FALSE(textfield_);
     textfield_ = new TestTextfield(style);
     textfield_->SetController(this);
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(textfield_);
@@ skipping 12 matching lines @@
     DCHECK(textfield_view_);
     model_ = textfield_view_->model_.get();
     model_->ClearEditHistory();
 
     input_method_ = new MockInputMethod();
     widget_->ReplaceInputMethod(input_method_);
 
     // Assumes the Widget is always focused.
     input_method_->OnFocus();
 
+    // TODO(msw): Determine why this requires two calls to work on Windows.
+    textfield_->RequestFocus();
     textfield_->RequestFocus();
   }
 
   ui::MenuModel* GetContextMenuModel() {
     textfield_view_->UpdateContextMenu();
     return textfield_view_->context_menu_contents_.get();
   }
 
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code,
@@ skipping 1487 matching lines @@
     EXPECT_EQ(char_rect[i], actual_rect) << " i=" << i;
   }
 
   // Return false if the index is out of range.
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 1, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 100, &rect));
 }
 
 }  // namespace views