Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Unified Diff: chrome/browser/ui/views/frame/browser_frame_ash.cc

Issue 713043004: MacViews: Get chrome/browser/ui/views/frame to compile (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ee0c9979701432ba4727fc3b1f56864b98b0385c..e7e05c5744542675664527d5b70327e28616627d 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 {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_ash.h ('k') | chrome/browser/ui/views/frame/browser_frame_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698