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

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

Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « ui/views/test/desktop_test_views_delegate.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/views/test/test_views_delegate.h" 5 #include "ui/views/test/test_views_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/test/web_contents_tester.h" 9 #include "content/public/test/web_contents_tester.h"
10 10
11 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 11 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
12 #include "ui/views/widget/native_widget_aura.h" 13 #include "ui/views/widget/native_widget_aura.h"
13 #include "ui/views/widget/desktop_native_widget_aura.h"
14 #endif 14 #endif
15 15
16 namespace views { 16 namespace views {
17 17
18 TestViewsDelegate::TestViewsDelegate() 18 TestViewsDelegate::TestViewsDelegate()
19 : use_transparent_windows_(false) { 19 : use_transparent_windows_(false) {
20 DCHECK(!ViewsDelegate::views_delegate); 20 DCHECK(!ViewsDelegate::views_delegate);
21 ViewsDelegate::views_delegate = this; 21 ViewsDelegate::views_delegate = this;
22 } 22 }
23 23
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 } 62 }
63 63
64 NativeWidget* TestViewsDelegate::CreateNativeWidget( 64 NativeWidget* TestViewsDelegate::CreateNativeWidget(
65 Widget::InitParams::Type type, 65 Widget::InitParams::Type type,
66 internal::NativeWidgetDelegate* delegate, 66 internal::NativeWidgetDelegate* delegate,
67 gfx::NativeView parent) { 67 gfx::NativeView parent) {
68 return NULL; 68 return NULL;
69 } 69 }
70 70
71 } // namespace views 71 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/desktop_test_views_delegate.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698