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

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

Issue 716463002: Revert "MacViews: Get chrome/browser/ui/views/frame to compile" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 563f309d1c8f672ca97dd9e457e647672390e1a3..9f576dc749cf90d357ece38af240f66bc538ad34 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -4,7 +4,6 @@
#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"
@@ -18,6 +17,8 @@
#include "ui/aura/window_observer.h"
#include "ui/views/view.h"
+using aura::Window;
+
namespace {
// BrowserWindowStateDelegate class handles a user's fullscreen
@@ -126,17 +127,12 @@ void BrowserFrameAsh::GetWindowPlacement(
////////////////////////////////////////////////////////////////////////////////
// BrowserFrameAsh, NativeBrowserFrame implementation:
-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
+views::NativeWidget* BrowserFrameAsh::AsNativeWidget() {
+ return this;
+}
- return params;
+const views::NativeWidget* BrowserFrameAsh::AsNativeWidget() const {
+ return this;
}
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