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

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

Issue 400543002: MacViews: Fix BrowserClient for toolkit-views on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: need scoped_ptr 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2b04c27bd41b760ea328f92db9ddbd2a746dec33 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,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);
};
« no previous file with comments | « no previous file | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698