OLD | NEW |
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 "headless/lib/browser/headless_content_browser_client.h" | 5 #include "headless/lib/browser/headless_content_browser_client.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 } | 49 } |
50 | 50 |
51 content::DevToolsManagerDelegate* | 51 content::DevToolsManagerDelegate* |
52 HeadlessContentBrowserClient::GetDevToolsManagerDelegate() { | 52 HeadlessContentBrowserClient::GetDevToolsManagerDelegate() { |
53 return new HeadlessDevToolsManagerDelegate(browser_->GetWeakPtr()); | 53 return new HeadlessDevToolsManagerDelegate(browser_->GetWeakPtr()); |
54 } | 54 } |
55 | 55 |
56 std::unique_ptr<base::Value> | 56 std::unique_ptr<base::Value> |
57 HeadlessContentBrowserClient::GetServiceManifestOverlay( | 57 HeadlessContentBrowserClient::GetServiceManifestOverlay( |
58 const std::string& name) { | 58 const std::string& name) { |
59 if (name != content::kBrowserServiceName) | 59 if (name != content::kBrowserServiceName || |
| 60 !browser_->options()->mojo_service_manifest_resource_id) |
60 return nullptr; | 61 return nullptr; |
| 62 |
61 base::StringPiece manifest_contents = | 63 base::StringPiece manifest_contents = |
62 ui::ResourceBundle::GetSharedInstance().GetRawDataResource( | 64 ui::ResourceBundle::GetSharedInstance().GetRawDataResource( |
63 IDR_HEADLESS_BROWSER_MANIFEST_OVERLAY); | 65 browser_->options()->mojo_service_manifest_resource_id); |
64 return base::JSONReader::Read(manifest_contents); | 66 return base::JSONReader::Read(manifest_contents); |
65 } | 67 } |
66 | 68 |
67 } // namespace headless | 69 } // namespace headless |
OLD | NEW |