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

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

Issue 2567293004: Makes WindowTreeHost::InitHost() not Show the window (Closed)
Patch Set: WTF::Show shows window Created 4 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 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 display::Display WindowTreeHostMus::GetDisplay() const { 120 display::Display WindowTreeHostMus::GetDisplay() const {
121 for (const display::Display& display : 121 for (const display::Display& display :
122 display::Screen::GetScreen()->GetAllDisplays()) { 122 display::Screen::GetScreen()->GetAllDisplays()) {
123 if (display.id() == display_id_) 123 if (display.id() == display_id_)
124 return display; 124 return display;
125 } 125 }
126 return display::Display(); 126 return display::Display();
127 } 127 }
128 128
129 void WindowTreeHostMus::ShowImpl() {
130 WindowTreeHostPlatform::ShowImpl();
131 window()->Show();
132 }
133
134 void WindowTreeHostMus::HideImpl() { 129 void WindowTreeHostMus::HideImpl() {
135 WindowTreeHostPlatform::HideImpl(); 130 WindowTreeHostPlatform::HideImpl();
136 window()->Hide(); 131 window()->Hide();
137 } 132 }
138 133
139 void WindowTreeHostMus::SetBoundsInPixels(const gfx::Rect& bounds) { 134 void WindowTreeHostMus::SetBoundsInPixels(const gfx::Rect& bounds) {
140 if (!in_set_bounds_from_server_) 135 if (!in_set_bounds_from_server_)
141 delegate_->OnWindowTreeHostBoundsWillChange(this, bounds); 136 delegate_->OnWindowTreeHostBoundsWillChange(this, bounds);
142 WindowTreeHostPlatform::SetBoundsInPixels(bounds); 137 WindowTreeHostPlatform::SetBoundsInPixels(bounds);
143 } 138 }
(...skipping 17 matching lines...) Expand all
161 void WindowTreeHostMus::OnCloseRequest() { 156 void WindowTreeHostMus::OnCloseRequest() {
162 OnHostCloseRequested(); 157 OnHostCloseRequested();
163 } 158 }
164 159
165 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { 160 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() {
166 // TODO: This should read the profile from mus. crbug.com/647510 161 // TODO: This should read the profile from mus. crbug.com/647510
167 return gfx::ICCProfile(); 162 return gfx::ICCProfile();
168 } 163 }
169 164
170 } // namespace aura 165 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698