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

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

Issue 1358533004: Move more of ContentHandler handling into PackageManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 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 "mojo/shell/application_instance.h" 5 #include "mojo/shell/application_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "mojo/application/public/interfaces/content_handler.mojom.h" 9 #include "mojo/application/public/interfaces/content_handler.mojom.h"
10 #include "mojo/common/common_type_converters.h" 10 #include "mojo/common/common_type_converters.h"
11 #include "mojo/common/url_type_converters.h" 11 #include "mojo/common/url_type_converters.h"
12 #include "mojo/shell/application_manager.h" 12 #include "mojo/shell/application_manager.h"
13 #include "mojo/shell/content_handler_connection.h"
14 13
15 namespace mojo { 14 namespace mojo {
16 namespace shell { 15 namespace shell {
17 16
18 ApplicationInstance::ApplicationInstance( 17 ApplicationInstance::ApplicationInstance(
19 ApplicationPtr application, 18 ApplicationPtr application,
20 ApplicationManager* manager, 19 ApplicationManager* manager,
21 const Identity& identity, 20 const Identity& identity,
22 uint32_t requesting_content_handler_id, 21 uint32_t requesting_content_handler_id,
23 const base::Closure& on_application_end) 22 const base::Closure& on_application_end)
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 156
158 queue_requests_ = false; 157 queue_requests_ = false;
159 for (auto request : queued_client_requests_) 158 for (auto request : queued_client_requests_)
160 CallAcceptConnection(make_scoped_ptr(request)); 159 CallAcceptConnection(make_scoped_ptr(request));
161 160
162 queued_client_requests_.clear(); 161 queued_client_requests_.clear();
163 } 162 }
164 163
165 } // namespace shell 164 } // namespace shell
166 } // namespace mojo 165 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698