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

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

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: merge Created 3 years, 7 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
« no previous file with comments | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/window_tree_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 WindowTreeHostMusInitParams init_params; 1481 WindowTreeHostMusInitParams init_params;
1482 init_params.window_port = base::MakeUnique<WindowPortMus>( 1482 init_params.window_port = base::MakeUnique<WindowPortMus>(
1483 this, WindowMusType::DISPLAY_MANUALLY_CREATED); 1483 this, WindowMusType::DISPLAY_MANUALLY_CREATED);
1484 roots_.insert(init_params.window_port.get()); 1484 roots_.insert(init_params.window_port.get());
1485 init_params.window_tree_client = this; 1485 init_params.window_tree_client = this;
1486 return init_params; 1486 return init_params;
1487 } 1487 }
1488 1488
1489 void WindowTreeClient::OnConnect(ClientSpecificId client_id) { 1489 void WindowTreeClient::OnConnect(ClientSpecificId client_id) {
1490 client_id_ = client_id; 1490 client_id_ = client_id;
1491 got_initial_displays_ = true;
1491 if (window_manager_delegate_) 1492 if (window_manager_delegate_)
1492 window_manager_delegate_->OnWmConnected(); 1493 window_manager_delegate_->OnWmConnected();
1493 } 1494 }
1494 1495
1495 void WindowTreeClient::WmNewDisplayAdded( 1496 void WindowTreeClient::WmNewDisplayAdded(
1496 const display::Display& display, 1497 const display::Display& display,
1497 ui::mojom::WindowDataPtr root_data, 1498 ui::mojom::WindowDataPtr root_data,
1498 bool parent_drawn, 1499 bool parent_drawn,
1499 const cc::FrameSinkId& frame_sink_id, 1500 const cc::FrameSinkId& frame_sink_id,
1500 const base::Optional<cc::LocalSurfaceId>& local_surface_id) { 1501 const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
2027 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 2028 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
2028 this, capture_synchronizer_.get(), window)); 2029 this, capture_synchronizer_.get(), window));
2029 } 2030 }
2030 2031
2031 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 2032 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
2032 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 2033 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
2033 this, focus_synchronizer_.get(), window)); 2034 this, focus_synchronizer_.get(), window));
2034 } 2035 }
2035 2036
2036 } // namespace aura 2037 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/window_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698