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

Side by Side Diff: ui/views/test/test_views_delegate.h

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 9 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 UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 5 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_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"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 content::BrowserContext* browser_context, 69 content::BrowserContext* browser_context,
70 content::SiteInstance* site_instance) OVERRIDE; 70 content::SiteInstance* site_instance) OVERRIDE;
71 virtual void OnBeforeWidgetInit( 71 virtual void OnBeforeWidgetInit(
72 Widget::InitParams* params, 72 Widget::InitParams* params,
73 internal::NativeWidgetDelegate* delegate) OVERRIDE; 73 internal::NativeWidgetDelegate* delegate) OVERRIDE;
74 virtual base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() OVERRIDE; 74 virtual base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() OVERRIDE;
75 75
76 private: 76 private:
77 bool use_transparent_windows_; 77 bool use_transparent_windows_;
78 78
79 #if defined(USE_AURA)
80 scoped_ptr<views::corewm::WMState> wm_state_; 79 scoped_ptr<views::corewm::WMState> wm_state_;
81 #endif
82 80
83 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); 81 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
84 }; 82 };
85 83
86 } // namespace views 84 } // namespace views
87 85
88 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 86 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698