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

Unified Diff: chrome/browser/ui/views/panels/panel_frame_view.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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/panels/panel_frame_view.cc
diff --git a/chrome/browser/ui/views/panels/panel_frame_view.cc b/chrome/browser/ui/views/panels/panel_frame_view.cc
index 8bc56a8505a4eec2f9cad7f8c0d1942ff1a60c93..a22164971ab1d3e065afddff1912ad4a284814a1 100644
--- a/chrome/browser/ui/views/panels/panel_frame_view.cc
+++ b/chrome/browser/ui/views/panels/panel_frame_view.cc
@@ -12,6 +12,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
+#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -31,10 +32,6 @@
#include "ui/views/win/hwnd_util.h"
#endif
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#endif
-
namespace {
// The thickness of the border when Aero is not enabled. In this case, the
@@ -312,7 +309,6 @@ void PanelFrameView::Init() {
title_label_->SetAutoColorReadabilityEnabled(false);
AddChildView(title_label_);
-#if defined(USE_AURA)
// Compute the thickness of the client area that needs to be counted towards
// mouse resizing.
// TODO(tdanderson): Remove this if possible (crbug.com/344924).
@@ -322,7 +318,6 @@ void PanelFrameView::Init() {
window->set_hit_test_bounds_override_inner(
gfx::Insets(thickness_for_mouse_resizing, thickness_for_mouse_resizing,
thickness_for_mouse_resizing, thickness_for_mouse_resizing));
-#endif
}
void PanelFrameView::UpdateTitle() {

Powered by Google App Engine
This is Rietveld 408576698