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

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

Issue 2568303006: aura-mus: Implement Deactivate(). (Closed)
Patch Set: Prune comments and other debugging gunk. Created 3 years, 11 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 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 const gfx::Insets& insets, 112 const gfx::Insets& insets,
113 const std::vector<gfx::Rect>& additional_client_area) { 113 const std::vector<gfx::Rect>& additional_client_area) {
114 delegate_->OnWindowTreeHostClientAreaWillChange(this, insets, 114 delegate_->OnWindowTreeHostClientAreaWillChange(this, insets,
115 additional_client_area); 115 additional_client_area);
116 } 116 }
117 117
118 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) { 118 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) {
119 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect); 119 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect);
120 } 120 }
121 121
122 void WindowTreeHostMus::DeactivateWindow() {
123 delegate_->OnWindowTreeHostDeactivateWindow(this);
124 }
125
122 display::Display WindowTreeHostMus::GetDisplay() const { 126 display::Display WindowTreeHostMus::GetDisplay() const {
123 display::Display display; 127 display::Display display;
124 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display); 128 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display);
125 return display; 129 return display;
126 } 130 }
127 131
128 void WindowTreeHostMus::HideImpl() { 132 void WindowTreeHostMus::HideImpl() {
129 WindowTreeHostPlatform::HideImpl(); 133 WindowTreeHostPlatform::HideImpl();
130 window()->Hide(); 134 window()->Hide();
131 } 135 }
(...skipping 23 matching lines...) Expand all
155 void WindowTreeHostMus::OnCloseRequest() { 159 void WindowTreeHostMus::OnCloseRequest() {
156 OnHostCloseRequested(); 160 OnHostCloseRequested();
157 } 161 }
158 162
159 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { 163 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() {
160 // TODO: This should read the profile from mus. crbug.com/647510 164 // TODO: This should read the profile from mus. crbug.com/647510
161 return gfx::ICCProfile(); 165 return gfx::ICCProfile();
162 } 166 }
163 167
164 } // namespace aura 168 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698