make menus, bubbles, etc. top level windows on aura

ui/views/widget/desktop_aura/desktop_root_window_host_win.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 "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 37 matching lines @@
 
 DesktopRootWindowHostWin::DesktopRootWindowHostWin(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           message_handler_(new HWNDMessageHandler(this))),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
       root_window_host_delegate_(NULL),
-      content_window_(NULL) {
+      content_window_(NULL),
+      window_expansion_(0, 0, 0, 0) {

[sky, 2013/03/14 20:06:37]

nit: this is the default.

[scottmg, 2013/03/14 22:51:53]

Done.

 }
 
 DesktopRootWindowHostWin::~DesktopRootWindowHostWin() {
   if (corewm::UseFocusControllerOnDesktop()) {
     aura::client::SetFocusClient(root_window_, NULL);
     aura::client::SetActivationClient(root_window_, NULL);
   }
 }
 
 // static
@@ skipping 91 matching lines @@
   drag_drop_client_.reset(new DesktopDragDropClientWin(root_window_,
                                                        GetHWND()));
   aura::client::SetDragDropClient(root_window_, drag_drop_client_.get());
 
   focus_client_->FocusWindow(content_window_);
   root_window_->SetProperty(kContentWindowForRootWindow, content_window_);
 
   return root_window_;
 }
 
+void DesktopRootWindowHostWin::InitFocus(aura::Window* window) {
+  focus_client_->FocusWindow(window);
+}
+
 void DesktopRootWindowHostWin::Close() {
   message_handler_->Close();
 }
 
 void DesktopRootWindowHostWin::CloseNow() {
   message_handler_->CloseNow();
 }
 
 aura::RootWindowHost* DesktopRootWindowHostWin::AsRootWindowHost() {
   return this;
@@ skipping 187 matching lines @@
 
 void DesktopRootWindowHostWin::Hide() {
   message_handler_->Hide();
 }
 
 void DesktopRootWindowHostWin::ToggleFullScreen() {
 }
 
 gfx::Rect DesktopRootWindowHostWin::GetBounds() const {
   // Match the logic in HWNDMessageHandler::ClientAreaSizeChanged().
   return WidgetSizeIsClientSize() ?

[sky, 2013/03/14 20:06:37]

What about this? Doesn't it need to change too?

[scottmg, 2013/03/14 22:51:53]

Done. (I'm a bit unclear on why it didn't matter -- I guess because it's not
generally called during animation).

       GetClientAreaBoundsInScreen() : GetWindowBoundsInScreen();
 }
 
 void DesktopRootWindowHostWin::SetBounds(const gfx::Rect& bounds) {
-  message_handler_->SetBounds(bounds);
+  gfx::Rect expanded(bounds.x() + window_expansion_.x(),
+                     bounds.y() + window_expansion_.y(),
+                     bounds.width() + window_expansion_.width(),
+                     bounds.height() + window_expansion_.height());
+  message_handler_->SetBounds(expanded);
 }
 
 gfx::Insets DesktopRootWindowHostWin::GetInsets() const {
   return gfx::Insets();
 }
 
 void DesktopRootWindowHostWin::SetInsets(const gfx::Insets& insets) {
 }
 
 gfx::Point DesktopRootWindowHostWin::GetLocationOnNativeScreen() const {
@@ skipping 54 matching lines @@
     const base::NativeEvent& native_event) {
 }
 
 void DesktopRootWindowHostWin::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
 }
 
 void DesktopRootWindowHostWin::PrepareForShutdown() {
 }
 
+void DesktopRootWindowHostWin::SetHostWindowExpansion(const gfx::Rect& extra) {
+  window_expansion_ = extra;
+  SetBounds(GetBounds());
+}
+
+

[sky, 2013/03/14 20:06:37]

nit: remove one of these newlines.

[scottmg, 2013/03/14 22:51:53]

Done.

 ////////////////////////////////////////////////////////////////////////////////
 // DesktopRootWindowHostWin, HWNDMessageHandlerDelegate implementation:
 
 bool DesktopRootWindowHostWin::IsWidgetWindow() const {
   return true;
 }
 
 bool DesktopRootWindowHostWin::IsUsingCustomFrame() const {
   return !GetWidget()->ShouldUseNativeFrame();
 }
@@ skipping 178 matching lines @@
 void DesktopRootWindowHostWin::HandleWorkAreaChanged() {
   GetWidget()->widget_delegate()->OnWorkAreaChanged();
 }
 
 void DesktopRootWindowHostWin::HandleVisibilityChanged(bool visible) {
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(visible);
 }
 
 void DesktopRootWindowHostWin::HandleClientSizeChanged(
     const gfx::Size& new_size) {
+  gfx::Size without_expansion(new_size.width() - window_expansion_.width(),
+                              new_size.height() - window_expansion_.height());
   if (root_window_host_delegate_)
     root_window_host_delegate_->OnHostResized(new_size);
   // TODO(beng): replace with a layout manager??
-  content_window_->SetBounds(gfx::Rect(new_size));
+  content_window_->SetBounds(gfx::Rect(without_expansion));
 }
 
 void DesktopRootWindowHostWin::HandleFrameChanged() {
   // Replace the frame and layout the contents.
   GetWidget()->non_client_view()->UpdateFrame(true);
 }
 
 void DesktopRootWindowHostWin::HandleNativeFocus(HWND last_focused_window) {
   // TODO(beng): inform the native_widget_delegate_.
   InputMethod* input_method = GetInputMethod();
@@ skipping 111 matching lines @@
 DesktopRootWindowHost* DesktopRootWindowHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds) {
   return new DesktopRootWindowHostWin(native_widget_delegate,
                                       desktop_native_widget_aura,
                                       initial_bounds);
 }
 
 }  // namespace views