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

Side by Side Diff: mash/shell/shell_application_delegate.cc

Issue 1719193003: Add a user id parameter to connections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « mash/shell/shell_application_delegate.h ('k') | mash/task_viewer/task_viewer.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/shell/shell_application_delegate.h" 5 #include "mash/shell/shell_application_delegate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.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"
11 11
12 namespace mash { 12 namespace mash {
13 namespace shell { 13 namespace shell {
14 14
15 ShellApplicationDelegate::ShellApplicationDelegate() 15 ShellApplicationDelegate::ShellApplicationDelegate()
16 : shell_(nullptr), screen_locked_(false) {} 16 : shell_(nullptr), screen_locked_(false) {}
17 17
18 ShellApplicationDelegate::~ShellApplicationDelegate() {} 18 ShellApplicationDelegate::~ShellApplicationDelegate() {}
19 19
20 void ShellApplicationDelegate::Initialize(mojo::Shell* shell, 20 void ShellApplicationDelegate::Initialize(mojo::Shell* shell,
21 const std::string& url, 21 const std::string& url,
22 uint32_t id) { 22 uint32_t id,
23 uint32_t user_id) {
23 shell_ = shell; 24 shell_ = shell;
24 StartBrowserDriver(); 25 StartBrowserDriver();
25 StartWindowManager(); 26 StartWindowManager();
26 StartSystemUI(); 27 StartSystemUI();
27 StartQuickLaunch(); 28 StartQuickLaunch();
28 } 29 }
29 30
30 bool ShellApplicationDelegate::AcceptConnection(mojo::Connection* connection) { 31 bool ShellApplicationDelegate::AcceptConnection(mojo::Connection* connection) {
31 connection->AddInterface<mash::shell::mojom::Shell>(this); 32 connection->AddInterface<mash::shell::mojom::Shell>(this);
32 return true; 33 return true;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // Note: |connection| may be null if we've lost our connection to the shell. 115 // Note: |connection| may be null if we've lost our connection to the shell.
115 if (connection) { 116 if (connection) {
116 connection->SetRemoteInterfaceProviderConnectionErrorHandler( 117 connection->SetRemoteInterfaceProviderConnectionErrorHandler(
117 restart_callback); 118 restart_callback);
118 connections_[url] = std::move(connection); 119 connections_[url] = std::move(connection);
119 } 120 }
120 } 121 }
121 122
122 } // namespace shell 123 } // namespace shell
123 } // namespace main 124 } // namespace main
OLDNEW
« no previous file with comments | « mash/shell/shell_application_delegate.h ('k') | mash/task_viewer/task_viewer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698