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

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

Issue 2568303006: aura-mus: Implement Deactivate(). (Closed)
Patch Set: 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 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/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 1562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 base::Optional<gfx::Rect> out_rect = base::nullopt; 1573 base::Optional<gfx::Rect> out_rect = base::nullopt;
1574 if (mask_rect) { 1574 if (mask_rect) {
1575 out_rect = gfx::ConvertRectToPixel(ScaleFactorForDisplay(window), 1575 out_rect = gfx::ConvertRectToPixel(ScaleFactorForDisplay(window),
1576 mask_rect.value()); 1576 mask_rect.value());
1577 } 1577 }
1578 1578
1579 tree_->SetHitTestMask(WindowMus::Get(window_tree_host->window())->server_id(), 1579 tree_->SetHitTestMask(WindowMus::Get(window_tree_host->window())->server_id(),
1580 out_rect); 1580 out_rect);
1581 } 1581 }
1582 1582
1583 void WindowTreeClient::OnWindowTreeHostClearFocus() {
1584 focus_synchronizer_->ClearFocus();
1585 }
1586
1583 std::unique_ptr<WindowPortMus> WindowTreeClient::CreateWindowPortForTopLevel( 1587 std::unique_ptr<WindowPortMus> WindowTreeClient::CreateWindowPortForTopLevel(
1584 const std::map<std::string, std::vector<uint8_t>>* properties) { 1588 const std::map<std::string, std::vector<uint8_t>>* properties) {
1585 std::unique_ptr<WindowPortMus> window_port = 1589 std::unique_ptr<WindowPortMus> window_port =
1586 base::MakeUnique<WindowPortMus>(this, WindowMusType::TOP_LEVEL); 1590 base::MakeUnique<WindowPortMus>(this, WindowMusType::TOP_LEVEL);
1587 roots_.insert(window_port.get()); 1591 roots_.insert(window_port.get());
1588 1592
1589 window_port->set_server_id(MakeTransportId(client_id_, next_window_id_++)); 1593 window_port->set_server_id(MakeTransportId(client_id_, next_window_id_++));
1590 RegisterWindowMus(window_port.get()); 1594 RegisterWindowMus(window_port.get());
1591 1595
1592 std::unordered_map<std::string, std::vector<uint8_t>> transport_properties; 1596 std::unordered_map<std::string, std::vector<uint8_t>> transport_properties;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1687 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1691 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1688 this, capture_synchronizer_.get(), window)); 1692 this, capture_synchronizer_.get(), window));
1689 } 1693 }
1690 1694
1691 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1695 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1692 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1696 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1693 this, focus_synchronizer_.get(), window)); 1697 this, focus_synchronizer_.get(), window));
1694 } 1698 }
1695 1699
1696 } // namespace aura 1700 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698