Allow the Views Delegate to provide the native widget.

content/shell/shell_aura.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 "content/shell/shell.h"
 
+#include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/desktop/desktop_screen.h"
 #include "ui/aura/desktop/desktop_stacking_client.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/single_display_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
-#include "ui/views/views_delegate.h"
+#include "ui/views/test/test_views_delegate.h"
+#include "ui/views/views_switches.h"
+#include "ui/views/widget/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
-namespace views {
 // ViewDelegate implementation for aura content shell
-class ShellViewsDelegateAura : public ViewsDelegate {
+class ShellViewsDelegateAura : public views::TestViewsDelegate {
  public:
-  ShellViewsDelegateAura()
-    : use_transparent_windows_(false) {
-    DCHECK(!ViewsDelegate::views_delegate);
-    ViewsDelegate::views_delegate = this;
+  ShellViewsDelegateAura() : use_transparent_windows_(false) {
   }
 
   virtual ~ShellViewsDelegateAura() {
     ViewsDelegate::views_delegate = NULL;
   }
 
   void SetUseTransparentWindows(bool transparent) {
     use_transparent_windows_ = transparent;
   }
 
-  // Overridden from ViewsDelegate:
-  virtual void SaveWindowPlacement(const Widget* window,
-                                   const std::string& window_name,
-                                   const gfx::Rect& bounds,
-                                   ui::WindowShowState show_state) OVERRIDE {
-  }
-
-  virtual bool GetSavedWindowPlacement(
-      const std::string& window_name,
-      gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE {
-    return false;
-  }
-
-  virtual void NotifyAccessibilityEvent(
-      View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {}
-
-  virtual void NotifyMenuItemFocused(const string16& menu_name,
-                                     const string16& menu_item_name,
-                                     int item_index,
-                                     int item_count,
-                                     bool has_submenu) OVERRIDE {}
-#if defined(OS_WIN)
-  virtual HICON GetDefaultWindowIcon() const OVERRIDE {
-    return NULL;
-  }
-#endif
-  virtual NonClientFrameView* CreateDefaultNonClientFrameView(
-      Widget* widget) OVERRIDE {
-    return NULL;
-  }
+  // Overridden from views::TestViewsDelegate:
   virtual bool UseTransparentWindows() const OVERRIDE {
     return use_transparent_windows_;
   }
-  virtual void AddRef() OVERRIDE {}
-  virtual void ReleaseRef() OVERRIDE {}
-
-  virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
-    return 0;
-  }
-
   virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
       views::NativeWidgetAura* native_widget) OVERRIDE {
     return new views::DesktopNativeWidgetHelperAura(native_widget);
   }
 
-  virtual content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE {
-    return NULL;
-  }
-
  private:
   bool use_transparent_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
 };
 
+// TODO(beng): This stuff should NOT be in the views namespace!
+namespace views {
+
 // Maintain the UI controls and web view for content shell
 class ShellWindowDelegateView : public WidgetDelegateView,
                                 public TextfieldController,
                                 public ButtonListener {
  public:
   enum UIControl {
     BACK_BUTTON,
     FORWARD_BUTTON,
     STOP_BUTTON
   };
@@ skipping 184 matching lines @@
 
   // Contents view contains the web contents view
   View* contents_view_;
   WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
 };
 
 }  // namespace views
 
+using views::ShellWindowDelegateView;
+
 namespace content {
 
-using views::ShellWindowDelegateView;
-using views::ShellViewsDelegateAura;
-
 aura::client::StackingClient* Shell::stacking_client_ = NULL;
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
 #endif
   aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
   stacking_client_ = new aura::DesktopStackingClient();
@@ skipping 61 matching lines @@
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content