| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 12 | 12 |
| 13 #if defined(USE_AURA) | 13 #if defined(USE_AURA) |
| 14 namespace views { | 14 namespace wm { |
| 15 namespace corewm { | |
| 16 class WMState; | 15 class WMState; |
| 17 } | 16 } |
| 18 } | |
| 19 #endif | 17 #endif |
| 20 | 18 |
| 21 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 19 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
| 22 public: | 20 public: |
| 23 ChromeBrowserMainExtraPartsViews(); | 21 ChromeBrowserMainExtraPartsViews(); |
| 24 virtual ~ChromeBrowserMainExtraPartsViews(); | 22 virtual ~ChromeBrowserMainExtraPartsViews(); |
| 25 | 23 |
| 26 // Overridden from ChromeBrowserMainExtraParts: | 24 // Overridden from ChromeBrowserMainExtraParts: |
| 27 virtual void ToolkitInitialized() OVERRIDE; | 25 virtual void ToolkitInitialized() OVERRIDE; |
| 28 | 26 |
| 29 private: | 27 private: |
| 30 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
| 31 scoped_ptr<views::corewm::WMState> wm_state_; | 29 scoped_ptr<wm::WMState> wm_state_; |
| 32 #endif | 30 #endif |
| 33 | 31 |
| 34 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 32 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
| 35 }; | 33 }; |
| 36 | 34 |
| 37 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 35 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| OLD | NEW |