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

Side by Side Diff: mojo/shell/app_child_process.cc

Issue 619493002: Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 #include "mojo/shell/app_child_process.h" 5 #include "mojo/shell/app_child_process.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 app_context->io_runner(), 183 app_context->io_runner(),
184 base::Bind(&AppChildControllerImpl::DidCreateChannel, 184 base::Bind(&AppChildControllerImpl::DidCreateChannel,
185 base::Unretained(impl.get())), 185 base::Unretained(impl.get())),
186 base::MessageLoopProxy::current())); 186 base::MessageLoopProxy::current()));
187 187
188 BindToPipe(impl.get(), host_message_pipe.Pass()); 188 BindToPipe(impl.get(), host_message_pipe.Pass());
189 189
190 app_context->set_controller(impl.Pass()); 190 app_context->set_controller(impl.Pass());
191 } 191 }
192 192
193 virtual void OnConnectionError() OVERRIDE { 193 virtual void OnConnectionError() override {
194 // TODO(darin): How should we handle a connection error here? 194 // TODO(darin): How should we handle a connection error here?
195 } 195 }
196 196
197 // |AppChildController| methods: 197 // |AppChildController| methods:
198 virtual void StartApp(const String& app_path, 198 virtual void StartApp(const String& app_path,
199 ScopedMessagePipeHandle service) OVERRIDE { 199 ScopedMessagePipeHandle service) override {
200 DVLOG(2) << "AppChildControllerImpl::StartApp(" << app_path << ", ...)"; 200 DVLOG(2) << "AppChildControllerImpl::StartApp(" << app_path << ", ...)";
201 DCHECK(thread_checker_.CalledOnValidThread()); 201 DCHECK(thread_checker_.CalledOnValidThread());
202 202
203 unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread, 203 unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread,
204 base::FilePath::FromUTF8Unsafe(app_path), 204 base::FilePath::FromUTF8Unsafe(app_path),
205 base::Passed(&service))); 205 base::Passed(&service)));
206 } 206 }
207 207
208 private: 208 private:
209 AppChildControllerImpl(AppContext* app_context, 209 AppChildControllerImpl(AppContext* app_context,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 base::Bind(&AppChildControllerImpl::Init, base::Unretained(&app_context), 283 base::Bind(&AppChildControllerImpl::Init, base::Unretained(&app_context),
284 base::Passed(platform_channel()), blocker.GetUnblocker())); 284 base::Passed(platform_channel()), blocker.GetUnblocker()));
285 // This will block, then run whatever the controller wants. 285 // This will block, then run whatever the controller wants.
286 blocker.Block(); 286 blocker.Block();
287 287
288 app_context.Shutdown(); 288 app_context.Shutdown();
289 } 289 }
290 290
291 } // namespace shell 291 } // namespace shell
292 } // namespace mojo 292 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698