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

Side by Side Diff: ui/views/mus/screen_mus.cc

Issue 1687693002: Rename ConnectToService to ConnectToInterface() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sp2
Patch Set: . Created 4 years, 10 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 | « sql/mojo/vfs_unittest.cc ('k') | ui/views/mus/surface_binding.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/views/mus/screen_mus.h" 5 #include "ui/views/mus/screen_mus.h"
6 6
7 // #include "components/mus/public/interfaces/window_manager_constants.mojom.h" 7 // #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
8 #include "mojo/converters/geometry/geometry_type_converters.h" 8 #include "mojo/converters/geometry/geometry_type_converters.h"
9 #include "mojo/shell/public/cpp/connection.h" 9 #include "mojo/shell/public/cpp/connection.h"
10 #include "mojo/shell/public/cpp/shell.h" 10 #include "mojo/shell/public/cpp/shell.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ScreenMus::ScreenMus(ScreenMusDelegate* delegate) 71 ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
72 : delegate_(delegate), 72 : delegate_(delegate),
73 primary_display_index_(0), 73 primary_display_index_(0),
74 display_manager_observer_binding_(this) {} 74 display_manager_observer_binding_(this) {}
75 75
76 ScreenMus::~ScreenMus() {} 76 ScreenMus::~ScreenMus() {}
77 77
78 void ScreenMus::Init(mojo::Shell* shell) { 78 void ScreenMus::Init(mojo::Shell* shell) {
79 gfx::Screen::SetScreenInstance(this); 79 gfx::Screen::SetScreenInstance(this);
80 80
81 shell->ConnectToService("mojo:mus", &display_manager_); 81 shell->ConnectToInterface("mojo:mus", &display_manager_);
82 82
83 display_manager_->AddObserver( 83 display_manager_->AddObserver(
84 display_manager_observer_binding_.CreateInterfacePtrAndBind()); 84 display_manager_observer_binding_.CreateInterfacePtrAndBind());
85 // We need the set of displays before we can continue. Wait for it. 85 // We need the set of displays before we can continue. Wait for it.
86 display_manager_observer_binding_.WaitForIncomingMethodCall(); 86 display_manager_observer_binding_.WaitForIncomingMethodCall();
87 87
88 // The WaitForIncomingMethodCall() should have supplied the set of Displays. 88 // The WaitForIncomingMethodCall() should have supplied the set of Displays.
89 DCHECK(displays_.size()); 89 DCHECK(displays_.size());
90 } 90 }
91 91
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 DCHECK_NE(-1, index); 225 DCHECK_NE(-1, index);
226 // Another display must become primary before the existing primary is 226 // Another display must become primary before the existing primary is
227 // removed. 227 // removed.
228 DCHECK_NE(index, primary_display_index_); 228 DCHECK_NE(index, primary_display_index_);
229 const gfx::Display display = displays_[index]; 229 const gfx::Display display = displays_[index];
230 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, 230 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
231 OnDisplayRemoved(display)); 231 OnDisplayRemoved(display));
232 } 232 }
233 233
234 } // namespace views 234 } // namespace views
OLDNEW
« no previous file with comments | « sql/mojo/vfs_unittest.cc ('k') | ui/views/mus/surface_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698