Index: chrome/browser/ui/views/frame/browser_frame_ash.cc |
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc |
index 9f576dc749cf90d357ece38af240f66bc538ad34..563f309d1c8f672ca97dd9e457e647672390e1a3 100644 |
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc |
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/ui/views/frame/browser_frame_ash.h" |
+#include "ash/shell.h" |
#include "ash/wm/window_properties.h" |
#include "ash/wm/window_state.h" |
#include "ash/wm/window_state_delegate.h" |
@@ -17,8 +18,6 @@ |
#include "ui/aura/window_observer.h" |
#include "ui/views/view.h" |
-using aura::Window; |
- |
namespace { |
// BrowserWindowStateDelegate class handles a user's fullscreen |
@@ -127,12 +126,17 @@ void BrowserFrameAsh::GetWindowPlacement( |
//////////////////////////////////////////////////////////////////////////////// |
// BrowserFrameAsh, NativeBrowserFrame implementation: |
-views::NativeWidget* BrowserFrameAsh::AsNativeWidget() { |
- return this; |
-} |
+views::Widget::InitParams BrowserFrameAsh::GetWidgetParams() { |
+ views::Widget::InitParams params; |
+ params.native_widget = this; |
+ |
+ params.context = ash::Shell::GetPrimaryRootWindow(); |
+#if defined(OS_WIN) |
+ // If this window is under ASH on Windows, we need it to be translucent. |
+ params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
+#endif |
-const views::NativeWidget* BrowserFrameAsh::AsNativeWidget() const { |
- return this; |
+ return params; |
} |
bool BrowserFrameAsh::UsesNativeSystemMenu() const { |