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

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

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « ui/views/test/test_views_delegate.h ('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/logging.h" 8 #include "base/logging.h"
8 #include "content/public/test/web_contents_tester.h" 9 #include "content/public/test/web_contents_tester.h"
10 #include "ui/views/views_switches.h"
11
12 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
13 #include "ui/views/widget/desktop_native_widget_aura.h"
14 #endif
9 15
10 namespace views { 16 namespace views {
11 17
12 TestViewsDelegate::TestViewsDelegate() 18 TestViewsDelegate::TestViewsDelegate()
13 : use_transparent_windows_(false) { 19 : use_transparent_windows_(false) {
14 DCHECK(!ViewsDelegate::views_delegate); 20 DCHECK(!ViewsDelegate::views_delegate);
15 ViewsDelegate::views_delegate = this; 21 ViewsDelegate::views_delegate = this;
16 } 22 }
17 23
18 TestViewsDelegate::~TestViewsDelegate() { 24 TestViewsDelegate::~TestViewsDelegate() {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 return NULL; 61 return NULL;
56 } 62 }
57 #endif 63 #endif
58 64
59 content::WebContents* TestViewsDelegate::CreateWebContents( 65 content::WebContents* TestViewsDelegate::CreateWebContents(
60 content::BrowserContext* browser_context, 66 content::BrowserContext* browser_context,
61 content::SiteInstance* site_instance) { 67 content::SiteInstance* site_instance) {
62 return NULL; 68 return NULL;
63 } 69 }
64 70
71 NativeWidget* TestViewsDelegate::CreateNativeWidget(
72 internal::NativeWidgetDelegate* delegate,
73 gfx::NativeView parent) {
74 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
75 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWinAura))
76 return new DesktopNativeWidgetAura(delegate);
77 #endif
78 return NULL;
79 }
80
65 } // namespace views 81 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698