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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/menu/menu_host.cc

Issue 2326933002: MacViews: Fix gn check fail for mac_views_browser on Aura dependencies. (Closed)
Patch Set: Typo. Created 4 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
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | ui/views/examples/examples_main.cc » ('j') | ui/views/test/scoped_views_test_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_host.cc
diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc
index c6750a6e0cd51be18d9470a45969bed6b27c0e4c..51807945d475d4e7207c5922626aae1a5109be42 100644
--- a/ui/views/controls/menu/menu_host.cc
+++ b/ui/views/controls/menu/menu_host.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
-#include "ui/aura/window_observer.h"
#include "ui/events/gestures/gesture_recognizer.h"
#include "ui/gfx/path.h"
#include "ui/native_theme/native_theme.h"
@@ -21,8 +20,9 @@
#include "ui/views/widget/native_widget_private.h"
#include "ui/views/widget/widget.h"
-#if !defined(OS_MACOSX)
-#include "ui/aura/window.h"
+#if defined(USE_AURA) && !defined(OS_MACOSX)
+#include "ui/aura/window.h" // nogncheck
+#include "ui/aura/window_observer.h" // nogncheck
#endif
namespace views {
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | ui/views/examples/examples_main.cc » ('j') | ui/views/test/scoped_views_test_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698