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

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
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 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 WindowTreeHostMusInitParams init_params; 1482 WindowTreeHostMusInitParams init_params;
1483 init_params.window_port = base::MakeUnique<WindowPortMus>( 1483 init_params.window_port = base::MakeUnique<WindowPortMus>(
1484 this, WindowMusType::DISPLAY_MANUALLY_CREATED); 1484 this, WindowMusType::DISPLAY_MANUALLY_CREATED);
1485 roots_.insert(init_params.window_port.get()); 1485 roots_.insert(init_params.window_port.get());
1486 init_params.window_tree_client = this; 1486 init_params.window_tree_client = this;
1487 return init_params; 1487 return init_params;
1488 } 1488 }
1489 1489
1490 void WindowTreeClient::OnConnect(ClientSpecificId client_id) { 1490 void WindowTreeClient::OnConnect(ClientSpecificId client_id) {
1491 client_id_ = client_id; 1491 client_id_ = client_id;
1492 got_initial_displays_ = true;
1492 if (window_manager_delegate_) 1493 if (window_manager_delegate_)
1493 window_manager_delegate_->OnWmConnected(); 1494 window_manager_delegate_->OnWmConnected();
1494 } 1495 }
1495 1496
1496 void WindowTreeClient::WmNewDisplayAdded( 1497 void WindowTreeClient::WmNewDisplayAdded(
1497 const display::Display& display, 1498 const display::Display& display,
1498 ui::mojom::WindowDataPtr root_data, 1499 ui::mojom::WindowDataPtr root_data,
1499 bool parent_drawn, 1500 bool parent_drawn,
1500 const cc::FrameSinkId& frame_sink_id, 1501 const cc::FrameSinkId& frame_sink_id,
1501 const base::Optional<cc::LocalSurfaceId>& local_surface_id) { 1502 const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
2028 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 2029 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
2029 this, capture_synchronizer_.get(), window)); 2030 this, capture_synchronizer_.get(), window));
2030 } 2031 }
2031 2032
2032 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 2033 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
2033 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 2034 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
2034 this, focus_synchronizer_.get(), window)); 2035 this, focus_synchronizer_.get(), window));
2035 } 2036 }
2036 2037
2037 } // namespace aura 2038 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698