Move WebDialogView to ui/views/controls/webview.

chrome/browser/ui/views/web_dialog_view_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/views/web_dialog_view.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/browser/ui/webui/test_web_dialog_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/controls/webview/web_dialog_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::BrowserContext;
 using content::WebContents;
 using testing::Eq;
 using ui::WebDialogDelegate;
 
 namespace {
 
 // Initial size of WebDialog for SizeWindow test case.
 const int kInitialWidth = 40;
 const int kInitialHeight = 40;
 
-class TestWebDialogView : public WebDialogView {
+class TestWebDialogView : public views::WebDialogView {
  public:
   TestWebDialogView(content::BrowserContext* context,
                     WebDialogDelegate* delegate)
-      : WebDialogView(context, delegate, new ChromeWebContentsHandler),
+      : views::WebDialogView(context, delegate, new ChromeWebContentsHandler),
         should_quit_on_size_change_(false) {
     delegate->GetDialogSize(&last_size_);
   }
 
   void set_should_quit_on_size_change(bool should_quit) {
     should_quit_on_size_change_ = should_quit;
   }
 
  private:
   // TODO(xiyuan): Update this when WidgetDelegate has bounds change hook.
   virtual void SaveWindowPlacement(const gfx::Rect& bounds,
                                    ui::WindowShowState show_state) OVERRIDE {
     if (should_quit_on_size_change_ && last_size_ != bounds.size()) {
       // Schedule message loop quit because we could be called while
       // the bounds change call is on the stack and not in the nested message
       // loop.
       MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
           &MessageLoop::Quit, base::Unretained(MessageLoop::current())));
     }
 
     last_size_ = bounds.size();
   }
 
   virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE {
     should_quit_on_size_change_ = false;  // No quit when we are closing.
-    WebDialogView::OnDialogClosed(json_retval);
+    views::WebDialogView::OnDialogClosed(json_retval);
   }
 
   // Whether we should quit message loop when size change is detected.
   bool should_quit_on_size_change_;
   gfx::Size last_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebDialogView);
 };
 
 }  // namespace
@@ skipping 87 matching lines @@
   // Check to make sure we can't get to 0x0
   set_bounds.set_width(0);
   set_bounds.set_height(0);
 
   view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_LT(0, actual_bounds.width());
   EXPECT_LT(0, actual_bounds.height());
 }