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

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

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/aura/env.h" 7 #include "ui/aura/env.h"
8 #include "ui/wm/core/wm_state.h" 8 #include "ui/wm/core/wm_state.h"
9 9
10 #if !defined(OS_CHROMEOS) 10 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
11 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 11 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
12 #endif // !defined(OS_CHROMEOS) 12 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
13 13
14 14
15 namespace views { 15 namespace views {
16 16
17 TestViewsDelegate::TestViewsDelegate() 17 TestViewsDelegate::TestViewsDelegate()
18 : context_factory_(nullptr), 18 : context_factory_(nullptr),
19 use_desktop_native_widgets_(false), 19 use_desktop_native_widgets_(false),
20 use_transparent_windows_(false) { 20 use_transparent_windows_(false) {
21 #if defined(USE_AURA) 21 #if defined(USE_AURA)
22 wm_state_.reset(new wm::WMState); 22 wm_state_.reset(new wm::WMState);
(...skipping 10 matching lines...) Expand all
33 #endif 33 #endif
34 34
35 void TestViewsDelegate::OnBeforeWidgetInit( 35 void TestViewsDelegate::OnBeforeWidgetInit(
36 Widget::InitParams* params, 36 Widget::InitParams* params,
37 internal::NativeWidgetDelegate* delegate) { 37 internal::NativeWidgetDelegate* delegate) {
38 if (params->opacity == Widget::InitParams::INFER_OPACITY) { 38 if (params->opacity == Widget::InitParams::INFER_OPACITY) {
39 params->opacity = use_transparent_windows_ ? 39 params->opacity = use_transparent_windows_ ?
40 Widget::InitParams::TRANSLUCENT_WINDOW : 40 Widget::InitParams::TRANSLUCENT_WINDOW :
41 Widget::InitParams::OPAQUE_WINDOW; 41 Widget::InitParams::OPAQUE_WINDOW;
42 } 42 }
43 #if !defined(OS_CHROMEOS) 43 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
44 if (!params->native_widget && use_desktop_native_widgets_) 44 if (!params->native_widget && use_desktop_native_widgets_)
45 params->native_widget = new DesktopNativeWidgetAura(delegate); 45 params->native_widget = new DesktopNativeWidgetAura(delegate);
46 #endif // !defined(OS_CHROMEOS) 46 #endif // !defined(OS_CHROMEOS)
47 } 47 }
48 48
49 ui::ContextFactory* TestViewsDelegate::GetContextFactory() { 49 ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
50 if (context_factory_) 50 if (context_factory_)
51 return context_factory_; 51 return context_factory_;
52 if (aura::Env::GetInstance()) 52 if (aura::Env::GetInstance())
53 return aura::Env::GetInstance()->context_factory(); 53 return aura::Env::GetInstance()->context_factory();
54 return nullptr; 54 return nullptr;
55 } 55 }
56 56
57 } // namespace views 57 } // namespace views
OLDNEW
« no previous file with comments | « ui/platform_window/android/platform_window_jni_registrar.cc ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698