Reverting 18872.

views/view_unittest.cc

 // Copyright (c) 2006-2008 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 <map>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
@@ skipping 288 matching lines @@
 TEST_F(ViewTest, MouseEvent) {
   TestView* v1 = new TestView();
   v1->SetBounds(0, 0, 300, 300);
 
   TestView* v2 = new TestView();
   v2->SetBounds (100, 100, 100, 100);
 
   views::WidgetWin window;
   window.set_delete_on_destroy(false);
   window.set_window_style(WS_OVERLAPPEDWINDOW);
-  window.Init(NULL, gfx::Rect(50, 50, 650, 650));
+  window.Init(NULL, gfx::Rect(50, 50, 650, 650), false);
   RootView* root = window.GetRootView();
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
 
   v1->Reset();
   v2->Reset();
 
   MouseEvent pressed(Event::ET_MOUSE_PRESSED,
                      110,
@@ skipping 320 matching lines @@
 TEST_F(ViewTest, TextfieldCutCopyPaste) {
   views::ViewsDelegate::views_delegate = new TestViewsDelegate;
 
   const std::wstring kNormalText = L"Normal";
   const std::wstring kReadOnlyText = L"Read only";
   const std::wstring kPasswordText = L"Password! ** Secret stuff **";
 
   Clipboard clipboard;
 
   WidgetWin* window = new WidgetWin;
-  window->Init(NULL, gfx::Rect(0, 0, 100, 100));
+  window->Init(NULL, gfx::Rect(0, 0, 100, 100), true);
   RootView* root_view = window->GetRootView();
 
   Textfield* normal = new Textfield();
   Textfield* read_only = new Textfield();
   read_only->SetReadOnly(true);
   Textfield* password = new Textfield(Textfield::STYLE_PASSWORD);
 
   root_view->AddChildView(normal);
   root_view->AddChildView(read_only);
   root_view->AddChildView(password);
@@ skipping 101 matching lines @@
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
   views::Accelerator return_accelerator(VK_RETURN, false, false, false);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
   // Create a window and add the view as its child.
   WidgetWin window;
-  window.Init(NULL, gfx::Rect(0, 0, 100, 100));
+  window.Init(NULL, gfx::Rect(0, 0, 100, 100), true);
   window.set_delete_on_destroy(false);
   window.set_window_style(WS_OVERLAPPEDWINDOW);
   RootView* root = window.GetRootView();
   root->AddChildView(view);
 
   // Get the focus manager.
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManagerForNativeView(window.GetNativeView());
+      views::FocusManager::GetFocusManager(window.GetNativeView());
   ASSERT_TRUE(focus_manager);
 
   // Hit the return key and see if it takes effect.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
 
   // Hit the escape key. Nothing should happen.
   views::Accelerator escape_accelerator(VK_ESCAPE, false, false, false);
   EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
@@ skipping 234 matching lines @@
         cancel_button_(NULL) {
   }
 
   virtual void SetUp() {
     dialog_view_ = new TestDialogView();
     views::Window* window =
         views::Window::CreateChromeWindow(NULL, gfx::Rect(0, 0, 100, 100),
                                           dialog_view_);
     window->Show();
     native_window_ = window->GetNativeWindow();
-    focus_manager_ = FocusManager::GetFocusManagerForNativeView(native_window_);
+    focus_manager_ = FocusManager::GetFocusManager(native_window_);
     client_view_ =
         static_cast<views::DialogClientView*>(window->GetClientView());
     ok_button_ = client_view_->ok_button();
     cancel_button_ = client_view_->cancel_button();
   }
 
   void SimularePressingEnterAndCheckDefaultButton(ButtonID button_id) {
 #if defined(OS_WIN)
     focus_manager_->OnKeyDown(native_window_, WM_KEYDOWN, VK_RETURN, 0);
 #else
@@ skipping 74 matching lines @@
   SimularePressingEnterAndCheckDefaultButton(OK);
 
   // Focus the cancel button.
   client_view_->FocusWillChange(NULL, cancel_button_);
   EXPECT_FALSE(ok_button_->is_default());
   EXPECT_TRUE(cancel_button_->is_default());
   EXPECT_FALSE(dialog_view_->button1_->is_default());
   EXPECT_FALSE(dialog_view_->button2_->is_default());
   SimularePressingEnterAndCheckDefaultButton(CANCEL);
 }