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

Unified Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 375843002: MacViews: Initial chrome_browser_ui.gypi support for views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: #ifdef instead Created 6 years, 5 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/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 21e227865c06365ec41cb3c6c1c375522fc8097b..2623ae5a5a2d51c5a8f515d65d2315b4049951a5 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
-#include "chrome/browser/chrome_browser_main.h"
#include "chrome/browser/ui/views/chrome_views_delegate.h"
-#include "chrome/common/chrome_switches.h"
-#include "ui/base/ui_base_switches.h"
+
+#if defined(USE_AURA)
#include "ui/wm/core/wm_state.h"
+#endif
ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
}
@@ -22,5 +22,7 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
if (!views::ViewsDelegate::views_delegate)
views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
+#if defined(USE_AURA)
wm_state_.reset(new wm::WMState);
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698