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

Side by Side Diff: mojo/shell/test_package_manager.h

Issue 1354813002: Revert of Don't use resolved url for instance identity in ApplicationManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « mojo/shell/package_manager.h ('k') | mojo/shell/test_package_manager.cc » ('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 #ifndef MOJO_SHELL_TEST_PACKAGE_MANAGER_H_ 5 #ifndef MOJO_SHELL_TEST_PACKAGE_MANAGER_H_
6 #define MOJO_SHELL_TEST_PACKAGE_MANAGER_H_ 6 #define MOJO_SHELL_TEST_PACKAGE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 ~TestPackageManager() override; 23 ~TestPackageManager() override;
24 24
25 void RegisterContentHandler(const std::string& mime_type, 25 void RegisterContentHandler(const std::string& mime_type,
26 const GURL& content_handler_url); 26 const GURL& content_handler_url);
27 27
28 private: 28 private:
29 using MimeTypeToURLMap = std::map<std::string, GURL>; 29 using MimeTypeToURLMap = std::map<std::string, GURL>;
30 30
31 // Overridden from PackageManager: 31 // Overridden from PackageManager:
32 void SetApplicationManager(ApplicationManager* manager) override; 32 void SetApplicationManager(ApplicationManager* manager) override;
33 GURL ResolveURL(const GURL& url) override;
33 void FetchRequest( 34 void FetchRequest(
34 URLRequestPtr request, 35 URLRequestPtr request,
35 const Fetcher::FetchCallback& loader_callback) override; 36 const Fetcher::FetchCallback& loader_callback) override;
36 bool HandleWithContentHandler(Fetcher* fetcher, 37 bool HandleWithContentHandler(Fetcher* fetcher,
37 const GURL& url, 38 const GURL& unresolved_url,
38 base::TaskRunner* task_runner, 39 base::TaskRunner* task_runner,
39 URLResponsePtr* new_response, 40 URLResponsePtr* new_response,
40 GURL* content_handler_url, 41 GURL* content_handler_url,
41 std::string* qualifier) override; 42 std::string* qualifier) override;
42 43
43 MimeTypeToURLMap mime_type_to_url_; 44 MimeTypeToURLMap mime_type_to_url_;
44 45
45 DISALLOW_COPY_AND_ASSIGN(TestPackageManager); 46 DISALLOW_COPY_AND_ASSIGN(TestPackageManager);
46 }; 47 };
47 48
48 } // namespace shell 49 } // namespace shell
49 } // namespace mojo 50 } // namespace mojo
50 51
51 #endif // MOJO_SHELL_TEST_PACKAGE_MANAGER_H_ 52 #endif // MOJO_SHELL_TEST_PACKAGE_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/shell/package_manager.h ('k') | mojo/shell/test_package_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698