Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / chrome_browser_main_extra_parts_views.h

diff --git a/src/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h b/src/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
index c8a630d..2b04c27 100644 (file)
--- a/src/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
+++ b/src/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
@@ -5,14 +5,15 @@
 #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/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 
+#if defined(USE_AURA)
 namespace wm {
 class WMState;
 }
+#endif
 
 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
  public:
@@ -23,7 +24,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);
 };