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

Unified Diff: chrome/app/mash/mash_runner.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/sysui_application.cc ('k') | components/filesystem/file_system_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 11df4c057ef632526c0390105502063172ddbf9a..2cde5438d506d2709a9c1fa81afc0eb4b6217dfa 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -21,9 +21,9 @@
#include "mash/wm/window_manager_application.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/background/background_shell.h"
-#include "mojo/shell/identity.h"
#include "mojo/shell/native_runner_delegate.h"
#include "mojo/shell/public/cpp/connector.h"
+#include "mojo/shell/public/cpp/identity.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
@@ -136,7 +136,7 @@ class NativeRunnerDelegateImpl : public mojo::shell::NativeRunnerDelegate {
private:
// mojo::shell::NativeRunnerDelegate:
void AdjustCommandLineArgumentsForTarget(
- const mojo::shell::Identity& target,
+ const mojo::Identity& target,
base::CommandLine* command_line) override {
if (target.name() != "exe:chrome") {
if (target.name() == "exe:chrome_mash")
« no previous file with comments | « ash/mus/sysui_application.cc ('k') | components/filesystem/file_system_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698