Move the web dialogs code to src/ui/web_dialogs from src/chrome

chrome/browser/ui/views/web_dialog_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_WEB_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEB_DIALOG_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/tab_render_watcher.h"
-#include "chrome/browser/ui/webui/web_dialog_delegate.h"
 #include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
+#include "ui/web_dialogs/web_dialog_delegate.h"
 
 class Browser;
 class WebDialogController;
 class Profile;
 
 namespace views {
 class WebView;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDialogView is a view used to display an web dialog to the user. The
 // content of the dialogs is determined by the delegate
-// (WebDialogDelegate), but is basically a file URL along with a
+// (ui::WebDialogDelegate), but is basically a file URL along with a
 // JSON input string. The HTML is supposed to show a UI to the user and is
 // expected to send back a JSON file as a return value.
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TODO(akalin): Make WebDialogView contain an WebDialogWebContentsDelegate
 // instead of inheriting from it to avoid violating the "no multiple
 // inheritance" rule.
 // TODO(beng): This class should not depend on Browser or Profile, only
 //             content::BrowserContext.
 class WebDialogView
     : public views::ClientView,
       public WebDialogWebContentsDelegate,
-      public WebDialogDelegate,
+      public ui::WebDialogDelegate,
       public views::WidgetDelegate,
       public TabRenderWatcher::Delegate {
  public:
   WebDialogView(Profile* profile,
                 Browser* browser,
-                WebDialogDelegate* delegate);
+                ui::WebDialogDelegate* delegate);
   virtual ~WebDialogView();
 
   // For testing.
   content::WebContents* web_contents();
 
   // Overridden from views::ClientView:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
       OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
   virtual bool CanClose() OVERRIDE;
 
   // Overridden from views::WidgetDelegate:
   virtual bool CanResize() const OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual std::string GetWindowName() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
-  // Overridden from WebDialogDelegate:
+  // Overridden from ui::WebDialogDelegate:
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
   virtual string16 GetDialogTitle() const OVERRIDE;
   virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
       std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
   virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
   virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE;
   virtual std::string GetDialogArgs() const OVERRIDE;
   virtual void OnDialogShown(
       content::WebUI* webui,
@@ skipping 38 matching lines @@
   // until the property is removed.
   bool initialized_;
 
   // Watches for WebContents rendering.
   scoped_ptr<TabRenderWatcher> tab_watcher_;
 
   // This view is a delegate to the HTML content since it needs to get notified
   // about when the dialog is closing. For all other actions (besides dialog
   // closing) we delegate to the creator of this view, which we keep track of
   // using this variable.
-  WebDialogDelegate* delegate_;
+  ui::WebDialogDelegate* delegate_;
 
   // Controls lifetime of dialog.
   scoped_ptr<WebDialogController> dialog_controller_;
 
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDialogView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEB_DIALOG_VIEW_H_