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

Unified Diff: chrome/browser/ui/views/status_bubble_views.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/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 46c1cfb201bf107871195aee8877f633bf6ad9d6..c566ea7e12e29768f1ca6e1be3e6023edc2e0e46 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -17,6 +17,7 @@
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkRect.h"
+#include "ui/aura/window.h"
#include "ui/base/theme_provider.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/animation/linear_animation.h"
@@ -34,10 +35,6 @@
#include "ui/views/widget/widget.h"
#include "url/gurl.h"
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#endif
-
#if defined(USE_ASH)
#include "ash/wm/window_state.h"
#endif
@@ -612,9 +609,7 @@ void StatusBubbleViews::Init() {
params.parent = frame->GetNativeView();
params.context = frame->GetNativeView();
popup_->Init(params);
-#if defined(USE_AURA)
popup_->GetNativeView()->SetName("StatusBubbleViews");
-#endif
// We do our own animation and don't want any from the system.
popup_->SetVisibilityChangedAnimationsEnabled(false);
popup_->SetOpacity(0x00);
« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_extension.cc ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698