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

Side by Side Diff: ui/views/test/test_views_delegate_mac.mm

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 5 years, 6 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
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/views/widget/native_widget_mac.h" 7 #include "ui/views/widget/native_widget_mac.h"
8 8
9 namespace views { 9 namespace views {
10 10
11 TestViewsDelegate::TestViewsDelegate() 11 TestViewsDelegate::TestViewsDelegate()
12 : context_factory_(nullptr), 12 : context_factory_(nullptr),
13 use_desktop_native_widgets_(false), 13 use_desktop_native_widgets_(false),
14 use_transparent_windows_(false) { 14 use_transparent_windows_(false) {
15 DCHECK(!ViewsDelegate::views_delegate);
16 ViewsDelegate::views_delegate = this;
17 } 15 }
18 16
19 TestViewsDelegate::~TestViewsDelegate() { 17 TestViewsDelegate::~TestViewsDelegate() {
20 if (ViewsDelegate::views_delegate == this)
21 ViewsDelegate::views_delegate = NULL;
22 } 18 }
23 19
24 void TestViewsDelegate::OnBeforeWidgetInit( 20 void TestViewsDelegate::OnBeforeWidgetInit(
25 Widget::InitParams* params, 21 Widget::InitParams* params,
26 internal::NativeWidgetDelegate* delegate) { 22 internal::NativeWidgetDelegate* delegate) {
27 if (params->opacity == Widget::InitParams::INFER_OPACITY) { 23 if (params->opacity == Widget::InitParams::INFER_OPACITY) {
28 params->opacity = use_transparent_windows_ ? 24 params->opacity = use_transparent_windows_ ?
29 Widget::InitParams::TRANSLUCENT_WINDOW : 25 Widget::InitParams::TRANSLUCENT_WINDOW :
30 Widget::InitParams::OPAQUE_WINDOW; 26 Widget::InitParams::OPAQUE_WINDOW;
31 } 27 }
32 // TODO(tapted): This should return a *Desktop*NativeWidgetMac. 28 // TODO(tapted): This should return a *Desktop*NativeWidgetMac.
33 if (!params->native_widget && use_desktop_native_widgets_) 29 if (!params->native_widget && use_desktop_native_widgets_)
34 params->native_widget = new NativeWidgetMac(delegate); 30 params->native_widget = new NativeWidgetMac(delegate);
35 } 31 }
36 32
37 ui::ContextFactory* TestViewsDelegate::GetContextFactory() { 33 ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
38 return context_factory_; 34 return context_factory_;
39 } 35 }
40 36
41 } // namespace views 37 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698