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

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

Issue 2755673003: Allow parallel creation of windows
Patch Set: Created 3 years, 9 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 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 DCHECK(it != windows_.end()); 877 DCHECK(it != windows_.end());
878 878
879 WindowTreeHostMus* window_tree_host = GetWindowTreeHostMus(it->second); 879 WindowTreeHostMus* window_tree_host = GetWindowTreeHostMus(it->second);
880 window_tree_host->InitHost(); 880 window_tree_host->InitHost();
881 ConfigureWindowDataFromServer(window_tree_host, *root_data); 881 ConfigureWindowDataFromServer(window_tree_host, *root_data);
882 882
883 // TODO(tonikitoo): Fix the WindowTreeClientDelegate::OnEmbed API. 883 // TODO(tonikitoo): Fix the WindowTreeClientDelegate::OnEmbed API.
884 // In external window mode, this needs not to pass the ownership of the 884 // In external window mode, this needs not to pass the ownership of the
885 // WindowTreeHostMus instance to the delegate_. A raw pointer should 885 // WindowTreeHostMus instance to the delegate_. A raw pointer should
886 // surface. 886 // surface.
887 delegate_->OnEmbed(nullptr); 887 delegate_->OnRootWindowEmbed(window_tree_host);
888 return; 888 return;
889 } 889 }
890 890
891 DCHECK(!tree_ptr_); 891 DCHECK(!tree_ptr_);
892 DCHECK(tree); 892 DCHECK(tree);
893 tree_ptr_ = std::move(tree); 893 tree_ptr_ = std::move(tree);
894 894
895 is_from_embed_ = true; 895 is_from_embed_ = true;
896 896
897 if (window_manager_delegate_) { 897 if (window_manager_delegate_) {
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1881 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1882 this, capture_synchronizer_.get(), window)); 1882 this, capture_synchronizer_.get(), window));
1883 } 1883 }
1884 1884
1885 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1885 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1886 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1886 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1887 this, focus_synchronizer_.get(), window)); 1887 this, focus_synchronizer_.get(), window));
1888 } 1888 }
1889 1889
1890 } // namespace aura 1890 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698