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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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)
14 namespace wm { 13 namespace wm {
15 class WMState; 14 class WMState;
16 } 15 }
17 #endif
18 16
19 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 17 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
20 public: 18 public:
21 ChromeBrowserMainExtraPartsViews(); 19 ChromeBrowserMainExtraPartsViews();
22 virtual ~ChromeBrowserMainExtraPartsViews(); 20 virtual ~ChromeBrowserMainExtraPartsViews();
23 21
24 // Overridden from ChromeBrowserMainExtraParts: 22 // Overridden from ChromeBrowserMainExtraParts:
25 virtual void ToolkitInitialized() OVERRIDE; 23 virtual void ToolkitInitialized() OVERRIDE;
26 24
27 private: 25 private:
28 #if defined(USE_AURA)
29 scoped_ptr<wm::WMState> wm_state_; 26 scoped_ptr<wm::WMState> wm_state_;
30 #endif
31 27
32 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 28 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
33 }; 29 };
34 30
35 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 31 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/certificate_viewer_win.cc ('k') | 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