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

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

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.h
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
index c8a630d64e48276816dfcef50485826f3f7c0440..8856be23b127721f91807e2ddfc8480ec048d94f 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
@@ -5,14 +5,13 @@
#ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
#define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chrome_browser_main_extra_parts.h"
+#include "base/macros.h"
+#if defined(USE_AURA)
namespace wm {
class WMState;
}
+#endif
class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
public:
@@ -23,7 +22,9 @@ class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
virtual void ToolkitInitialized() OVERRIDE;
private:
+#if defined(USE_AURA)
scoped_ptr<wm::WMState> wm_state_;
+#endif
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
};

Powered by Google App Engine
This is Rietveld 408576698