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

Side by Side Diff: mash/login/login.cc

Issue 2037033004: Renames mojo:desktop_wm to mojo:ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « chrome/app/mash/mash_runner.cc ('k') | mash/session/session.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 "mash/login/login.h" 5 #include "mash/login/login.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/public/interfaces/container.mojom.h" 10 #include "ash/public/interfaces/container.mojom.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 login_button_1_->SetBounds(button_box.x(), button_box.y(), ps1.width(), 108 login_button_1_->SetBounds(button_box.x(), button_box.y(), ps1.width(),
109 ps1.height()); 109 ps1.height());
110 login_button_2_->SetBounds(login_button_1_->bounds().right() + 10, 110 login_button_2_->SetBounds(login_button_1_->bounds().right() + 10,
111 button_box.y(), ps2.width(), ps2.height()); 111 button_box.y(), ps2.width(), ps2.height());
112 } 112 }
113 113
114 // Overridden from views::ButtonListener: 114 // Overridden from views::ButtonListener:
115 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 115 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
116 116
117 void StartWindowManager() { 117 void StartWindowManager() {
118 window_manager_connection_ = connector_->Connect("mojo:desktop_wm"); 118 window_manager_connection_ = connector_->Connect("mojo:ash");
119 window_manager_connection_->SetConnectionLostClosure( 119 window_manager_connection_->SetConnectionLostClosure(
120 base::Bind(&UI::StartWindowManager, base::Unretained(this))); 120 base::Bind(&UI::StartWindowManager, base::Unretained(this)));
121 } 121 }
122 122
123 Login* login_; 123 Login* login_;
124 shell::Connector* connector_; 124 shell::Connector* connector_;
125 const std::string user_id_1_; 125 const std::string user_id_1_;
126 const std::string user_id_2_; 126 const std::string user_id_2_;
127 views::LabelButton* login_button_1_; 127 views::LabelButton* login_button_1_;
128 views::LabelButton* login_button_2_; 128 views::LabelButton* login_button_2_;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 } 200 }
201 201
202 } // namespace 202 } // namespace
203 203
204 shell::ShellClient* CreateLogin() { 204 shell::ShellClient* CreateLogin() {
205 return new Login; 205 return new Login;
206 } 206 }
207 207
208 } // namespace login 208 } // namespace login
209 } // namespace main 209 } // namespace main
OLDNEW
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698