OLD | NEW |
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 "content/browser/manifest/manifest_manager_host.h" | 5 #include "content/browser/manifest/manifest_manager_host.h" |
6 | 6 |
7 #include "content/common/manifest_manager_messages.h" | 7 #include "content/common/manifest_manager_messages.h" |
8 #include "content/public/browser/render_frame_host.h" | 8 #include "content/public/browser/render_frame_host.h" |
9 #include "content/public/browser/render_process_host.h" | 9 #include "content/public/browser/render_process_host.h" |
10 #include "content/public/common/manifest.h" | 10 #include "content/public/common/manifest.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 | 102 |
103 // When receiving a Manifest, the browser process can't trust that it is | 103 // When receiving a Manifest, the browser process can't trust that it is |
104 // coming from a known and secure source. It must be processed accordingly. | 104 // coming from a known and secure source. It must be processed accordingly. |
105 Manifest manifest = insecure_manifest; | 105 Manifest manifest = insecure_manifest; |
106 manifest.name = base::NullableString16( | 106 manifest.name = base::NullableString16( |
107 manifest.name.string().substr(0, Manifest::kMaxIPCStringLength), | 107 manifest.name.string().substr(0, Manifest::kMaxIPCStringLength), |
108 manifest.name.is_null()); | 108 manifest.name.is_null()); |
109 manifest.short_name = base::NullableString16( | 109 manifest.short_name = base::NullableString16( |
110 manifest.short_name.string().substr(0, Manifest::kMaxIPCStringLength), | 110 manifest.short_name.string().substr(0, Manifest::kMaxIPCStringLength), |
111 manifest.short_name.is_null()); | 111 manifest.short_name.is_null()); |
| 112 if (!manifest.start_url.is_empty() && !manifest.start_url.is_valid()) |
| 113 manifest.start_url = GURL(); |
112 | 114 |
113 callback->Run(manifest); | 115 callback->Run(manifest); |
114 callbacks->Remove(request_id); | 116 callbacks->Remove(request_id); |
115 if (callbacks->IsEmpty()) { | 117 if (callbacks->IsEmpty()) { |
116 delete callbacks; | 118 delete callbacks; |
117 pending_callbacks_.erase(render_frame_host); | 119 pending_callbacks_.erase(render_frame_host); |
118 } | 120 } |
119 } | 121 } |
120 | 122 |
121 } // namespace content | 123 } // namespace content |
OLD | NEW |