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

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

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 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 #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 #include "ui/views/views_switches.h" 10 #include "ui/views/views_switches.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 bool TestViewsDelegate::UseTransparentWindows() const { 50 bool TestViewsDelegate::UseTransparentWindows() const {
51 return use_transparent_windows_; 51 return use_transparent_windows_;
52 } 52 }
53 53
54 int TestViewsDelegate::GetDispositionForEvent(int event_flags) { 54 int TestViewsDelegate::GetDispositionForEvent(int event_flags) {
55 return 0; 55 return 0;
56 } 56 }
57 57
58 #if defined(USE_AURA) 58 #if defined(USE_AURA)
59 views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper( 59 views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper(
60 views::NativeWidgetAura* native_widget) { 60 views::NativeWidgetAura* native_widget, gfx::NativeView parent) {
61 return NULL; 61 return NULL;
62 } 62 }
63 #endif 63 #endif
64 64
65 content::WebContents* TestViewsDelegate::CreateWebContents( 65 content::WebContents* TestViewsDelegate::CreateWebContents(
66 content::BrowserContext* browser_context, 66 content::BrowserContext* browser_context,
67 content::SiteInstance* site_instance) { 67 content::SiteInstance* site_instance) {
68 return NULL; 68 return NULL;
69 } 69 }
70 70
71 NativeWidget* TestViewsDelegate::CreateNativeWidget( 71 NativeWidget* TestViewsDelegate::CreateNativeWidget(
72 Widget::InitParams::Type type, 72 Widget::InitParams::Type type,
73 internal::NativeWidgetDelegate* delegate, 73 internal::NativeWidgetDelegate* delegate,
74 gfx::NativeView parent) { 74 gfx::NativeView parent) {
75 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 75 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
76 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDesktopAura)) 76 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDesktopAura))
77 return new DesktopNativeWidgetAura(delegate); 77 return new DesktopNativeWidgetAura(delegate);
78 #endif 78 #endif
79 return NULL; 79 return NULL;
80 } 80 }
81 81
82 } // namespace views 82 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698