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

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

Issue 2495423005: Enables passing initial properties to top level window creation (Closed)
Patch Set: cleanup Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/native_widget_factory.h" 5 #include "ui/views/test/native_widget_factory.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/views/mus/desktop_window_tree_host_mus.h" 8 #include "ui/views/mus/desktop_window_tree_host_mus.h"
9 #include "ui/views/mus/mus_client.h" 9 #include "ui/views/mus/mus_client.h"
10 #include "ui/views/test/test_platform_native_widget.h" 10 #include "ui/views/test/test_platform_native_widget.h"
(...skipping 11 matching lines...) Expand all
22 int32_t type, 22 int32_t type,
23 bool* destroyed) { 23 bool* destroyed) {
24 if (!create_desktop_native_widget_aura) { 24 if (!create_desktop_native_widget_aura) {
25 return new TestPlatformNativeWidget<NativeWidgetAura>( 25 return new TestPlatformNativeWidget<NativeWidgetAura>(
26 widget, type == kStubCapture, destroyed); 26 widget, type == kStubCapture, destroyed);
27 } 27 }
28 DesktopNativeWidgetAura* desktop_native_widget_aura = 28 DesktopNativeWidgetAura* desktop_native_widget_aura =
29 new TestPlatformNativeWidget<DesktopNativeWidgetAura>( 29 new TestPlatformNativeWidget<DesktopNativeWidgetAura>(
30 widget, type == kStubCapture, destroyed); 30 widget, type == kStubCapture, destroyed);
31 desktop_native_widget_aura->SetDesktopWindowTreeHost( 31 desktop_native_widget_aura->SetDesktopWindowTreeHost(
32 base::MakeUnique<DesktopWindowTreeHostMus>(widget, 32 base::MakeUnique<DesktopWindowTreeHostMus>(
33 desktop_native_widget_aura)); 33 widget, desktop_native_widget_aura, init_params));
34 return desktop_native_widget_aura; 34 return desktop_native_widget_aura;
35 } 35 }
36 36
37 } // namespace 37 } // namespace
38 38
39 NativeWidget* CreatePlatformNativeWidgetImpl( 39 NativeWidget* CreatePlatformNativeWidgetImpl(
40 const Widget::InitParams& init_params, 40 const Widget::InitParams& init_params,
41 Widget* widget, 41 Widget* widget,
42 uint32_t type, 42 uint32_t type,
43 bool* destroyed) { 43 bool* destroyed) {
44 // Only create a NativeWidgetAura if necessary, otherwise use 44 // Only create a NativeWidgetAura if necessary, otherwise use
45 // DesktopNativeWidgetAura. 45 // DesktopNativeWidgetAura.
46 return CreatePlatformNativeWidgetImplAuraMus( 46 return CreatePlatformNativeWidgetImplAuraMus(
47 MusClient::ShouldCreateDesktopNativeWidgetAura(init_params), init_params, 47 MusClient::ShouldCreateDesktopNativeWidgetAura(init_params), init_params,
48 widget, type, destroyed); 48 widget, type, destroyed);
49 } 49 }
50 50
51 NativeWidget* CreatePlatformDesktopNativeWidgetImpl( 51 NativeWidget* CreatePlatformDesktopNativeWidgetImpl(
52 const Widget::InitParams& init_params, 52 const Widget::InitParams& init_params,
53 Widget* widget, 53 Widget* widget,
54 bool* destroyed) { 54 bool* destroyed) {
55 return CreatePlatformNativeWidgetImplAuraMus(true, init_params, widget, 55 return CreatePlatformNativeWidgetImplAuraMus(true, init_params, widget,
56 kDefault, destroyed); 56 kDefault, destroyed);
57 } 57 }
58 58
59 } // namespace test 59 } // namespace test
60 } // namespace views 60 } // namespace views
OLDNEW
« ui/aura/window_tree_host_platform.h ('K') | « ui/views/mus/window_tree_host_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698