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

Side by Side Diff: mash/quick_launch/quick_launch_application.cc

Issue 1899323002: Add mash shelf application id support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address simpler comments. Created 4 years, 8 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 | « mash/login/login.cc ('k') | mash/screenlock/screenlock.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/quick_launch/quick_launch_application.h" 5 #include "mash/quick_launch/quick_launch_application.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 base::MessageLoop::current()->QuitWhenIdle(); 167 base::MessageLoop::current()->QuitWhenIdle();
168 } 168 }
169 169
170 void QuickLaunchApplication::Initialize(shell::Connector* connector, 170 void QuickLaunchApplication::Initialize(shell::Connector* connector,
171 const shell::Identity& identity, 171 const shell::Identity& identity,
172 uint32_t id) { 172 uint32_t id) {
173 connector_ = connector; 173 connector_ = connector;
174 tracing_.Initialize(connector, identity.name()); 174 tracing_.Initialize(connector, identity.name());
175 175
176 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); 176 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
177 views::WindowManagerConnection::Create(connector); 177 views::WindowManagerConnection::Create(connector, identity);
178 178
179 Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW); 179 Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
180 } 180 }
181 181
182 bool QuickLaunchApplication::AcceptConnection(shell::Connection* connection) { 182 bool QuickLaunchApplication::AcceptConnection(shell::Connection* connection) {
183 connection->AddInterface<mojom::Launchable>(this); 183 connection->AddInterface<mojom::Launchable>(this);
184 return true; 184 return true;
185 } 185 }
186 186
187 void QuickLaunchApplication::Launch(uint32_t what, mojom::LaunchMode how) { 187 void QuickLaunchApplication::Launch(uint32_t what, mojom::LaunchMode how) {
(...skipping 13 matching lines...) Expand all
201 windows_.push_back(window); 201 windows_.push_back(window);
202 } 202 }
203 203
204 void QuickLaunchApplication::Create(shell::Connection* connection, 204 void QuickLaunchApplication::Create(shell::Connection* connection,
205 mojom::LaunchableRequest request) { 205 mojom::LaunchableRequest request) {
206 bindings_.AddBinding(this, std::move(request)); 206 bindings_.AddBinding(this, std::move(request));
207 } 207 }
208 208
209 } // namespace quick_launch 209 } // namespace quick_launch
210 } // namespace mash 210 } // namespace mash
OLDNEW
« no previous file with comments | « mash/login/login.cc ('k') | mash/screenlock/screenlock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698