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

Unified Diff: chrome/browser/ui/views/tabs/dragged_tab_view.cc

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months 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/tabs/dragged_tab_view.cc
===================================================================
--- chrome/browser/ui/views/tabs/dragged_tab_view.cc (revision 99764)
+++ chrome/browser/ui/views/tabs/dragged_tab_view.cc (working copy)
@@ -10,7 +10,9 @@
#include "ui/gfx/canvas_skia.h"
#include "views/widget/widget.h"
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#include "views/widget/native_widget_aura.h"
+#elif defined(OS_WIN)
#include "views/widget/native_widget_win.h"
#elif defined(TOOLKIT_USES_GTK)
#include "views/widget/native_widget_gtk.h"
@@ -47,7 +49,7 @@
params.bounds = gfx::Rect(PreferredContainerSize());
container_->Init(params);
container_->SetContentsView(this);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
static_cast<views::NativeWidgetWin*>(container_->native_widget())->
set_can_update_layered_window(false);
@@ -80,7 +82,7 @@
}
int y = screen_point.y() - ScaleValue(mouse_tab_offset_.y());
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// TODO(beng): make this cross-platform
int show_flags = container_->IsVisible() ? SWP_NOZORDER : SWP_SHOWWINDOW;
SetWindowPos(container_->GetNativeView(), HWND_TOP, x, y, 0, 0,
« no previous file with comments | « chrome/browser/ui/views/tabs/dragged_tab_controller.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698