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

Side by Side Diff: ui/aura/mus/window_tree_host_mus.cc

Issue 2464123003: Enabling Aura-Mus clients to submit frames to Mus. (Closed)
Patch Set: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/aura/mus/window_tree_host_mus.h" 5 #include "ui/aura/mus/window_tree_host_mus.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/mus/input_method_mus.h" 9 #include "ui/aura/mus/input_method_mus.h"
10 #include "ui/aura/mus/window_port_mus.h" 10 #include "ui/aura/mus/window_port_mus.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 content_window_observer_ = 89 content_window_observer_ =
90 base::MakeUnique<ContentWindowObserver>(this, content_window_); 90 base::MakeUnique<ContentWindowObserver>(this, content_window_);
91 } else { 91 } else {
92 // Initialize the stub platform window bounds to those of the ui::Window. 92 // Initialize the stub platform window bounds to those of the ui::Window.
93 platform_window()->SetBounds(window()->bounds()); 93 platform_window()->SetBounds(window()->bounds());
94 } 94 }
95 95
96 input_method_ = base::MakeUnique<InputMethodMus>( 96 input_method_ = base::MakeUnique<InputMethodMus>(
97 this, content_window_ ? content_window_ : window()); 97 this, content_window_ ? content_window_ : window());
98 98
99 // TODO: hook up to compositor correctly.
100 // compositor()->SetWindow(window);
101
102 compositor()->SetHostHasTransparentBackground(true); 99 compositor()->SetHostHasTransparentBackground(true);
103 100
104 // Mus windows are assumed hidden. 101 // Mus windows are assumed hidden.
105 compositor()->SetVisible(false); 102 compositor()->SetVisible(false);
106 } 103 }
107 104
108 WindowTreeHostMus::~WindowTreeHostMus() { 105 WindowTreeHostMus::~WindowTreeHostMus() {
109 DestroyCompositor(); 106 DestroyCompositor();
110 DestroyDispatcher(); 107 DestroyDispatcher();
111 } 108 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 void WindowTreeHostMus::OnCloseRequest() { 189 void WindowTreeHostMus::OnCloseRequest() {
193 OnHostCloseRequested(); 190 OnHostCloseRequested();
194 } 191 }
195 192
196 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { 193 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() {
197 // TODO: This should read the profile from mus. crbug.com/647510 194 // TODO: This should read the profile from mus. crbug.com/647510
198 return gfx::ICCProfile(); 195 return gfx::ICCProfile();
199 } 196 }
200 197
201 } // namespace aura 198 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698