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

Side by Side Diff: mojo/public/cpp/application/application_impl.h

Issue 683583002: Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: geolocation Created 6 years, 1 month 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 | « mojo/public/cpp/application/DEPS ('k') | mojo/public/cpp/application/application_test_base.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 5 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
7 #include <vector> 7 #include <vector>
8 8
9 #include "mojo/public/cpp/application/application_connection.h" 9 #include "mojo/public/cpp/application/application_connection.h"
10 #include "mojo/public/cpp/application/lib/service_connector.h" 10 #include "mojo/public/cpp/application/lib/service_connector.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 public: 54 public:
55 ApplicationImpl(ApplicationDelegate* delegate, 55 ApplicationImpl(ApplicationDelegate* delegate,
56 ScopedMessagePipeHandle shell_handle); 56 ScopedMessagePipeHandle shell_handle);
57 ApplicationImpl(ApplicationDelegate* delegate, MojoHandle shell_handle); 57 ApplicationImpl(ApplicationDelegate* delegate, MojoHandle shell_handle);
58 ~ApplicationImpl() override; 58 ~ApplicationImpl() override;
59 59
60 Shell* shell() const { return shell_.get(); } 60 Shell* shell() const { return shell_.get(); }
61 61
62 // Returns any initial configuration arguments, passed by the Shell. 62 // Returns any initial configuration arguments, passed by the Shell.
63 const std::vector<std::string>& args() const { return args_; } 63 const std::vector<std::string>& args() const { return args_; }
64 bool HasArg(const std::string& arg) const;
64 65
65 // Establishes a new connection to an application. Caller does not own. 66 // Establishes a new connection to an application. Caller does not own.
66 ApplicationConnection* ConnectToApplication(const String& application_url); 67 ApplicationConnection* ConnectToApplication(const String& application_url);
67 68
68 // Connect to application identified by |application_url| and connect to the 69 // Connect to application identified by |application_url| and connect to the
69 // service implementation of the interface identified by |Interface|. 70 // service implementation of the interface identified by |Interface|.
70 template <typename Interface> 71 template <typename Interface>
71 void ConnectToService(const std::string& application_url, 72 void ConnectToService(const std::string& application_url,
72 InterfacePtr<Interface>* ptr) { 73 InterfacePtr<Interface>* ptr) {
73 ConnectToApplication(application_url)->ConnectToService(ptr); 74 ConnectToApplication(application_url)->ConnectToService(ptr);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 ShellPtr shell_; 109 ShellPtr shell_;
109 ShellPtrWatcher* shell_watch_; 110 ShellPtrWatcher* shell_watch_;
110 std::vector<std::string> args_; 111 std::vector<std::string> args_;
111 112
112 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl); 113 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
113 }; 114 };
114 115
115 } // namespace mojo 116 } // namespace mojo
116 117
117 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 118 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/public/cpp/application/DEPS ('k') | mojo/public/cpp/application/application_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698