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

Side by Side Diff: ash/mus/sysui_application.cc

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« no previous file with comments | « ash/mus/sysui_application.h ('k') | chrome/app/mash/mash_runner.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 "ash/mus/sysui_application.h" 5 #include "ash/mus/sysui_application.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/host/ash_window_tree_host_init_params.h" 8 #include "ash/host/ash_window_tree_host_init_params.h"
9 #include "ash/host/ash_window_tree_host_platform.h" 9 #include "ash/host/ash_window_tree_host_platform.h"
10 #include "ash/mus/keyboard_ui_mus.h" 10 #include "ash/mus/keyboard_ui_mus.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 scoped_ptr<NativeWidgetFactory> native_widget_factory_; 271 scoped_ptr<NativeWidgetFactory> native_widget_factory_;
272 272
273 DISALLOW_COPY_AND_ASSIGN(AshInit); 273 DISALLOW_COPY_AND_ASSIGN(AshInit);
274 }; 274 };
275 275
276 SysUIApplication::SysUIApplication() {} 276 SysUIApplication::SysUIApplication() {}
277 277
278 SysUIApplication::~SysUIApplication() {} 278 SysUIApplication::~SysUIApplication() {}
279 279
280 void SysUIApplication::Initialize(mojo::Connector* connector, 280 void SysUIApplication::Initialize(mojo::Connector* connector,
281 const std::string& url, 281 const mojo::Identity& identity,
282 const std::string& user_id,
283 uint32_t id) { 282 uint32_t id) {
284 ash_init_.reset(new AshInit()); 283 ash_init_.reset(new AshInit());
285 ash_init_->Initialize(connector); 284 ash_init_->Initialize(connector);
286 } 285 }
287 286
288 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { 287 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {
289 return true; 288 return true;
290 } 289 }
291 290
292 } // namespace sysui 291 } // namespace sysui
293 } // namespace ash 292 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/sysui_application.h ('k') | chrome/app/mash/mash_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698