Chromium Code Reviews| 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 "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "content/common/manifest_manager_messages.h" | 8 #include "content/common/manifest_manager_messages.h" |
| 9 #include "content/public/browser/render_frame_host.h" | 9 #include "content/public/browser/render_frame_host.h" |
| 10 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 129 0, Manifest::kMaxIPCStringLength), | 129 0, Manifest::kMaxIPCStringLength), |
| 130 manifest.gcm_sender_id.is_null()); | 130 manifest.gcm_sender_id.is_null()); |
| 131 for (auto& related_application : manifest.related_applications) { | 131 for (auto& related_application : manifest.related_applications) { |
| 132 if (!related_application.url.is_valid()) | 132 if (!related_application.url.is_valid()) |
| 133 related_application.url = GURL(); | 133 related_application.url = GURL(); |
| 134 related_application.id = | 134 related_application.id = |
| 135 base::NullableString16(related_application.id.string().substr( | 135 base::NullableString16(related_application.id.string().substr( |
| 136 0, Manifest::kMaxIPCStringLength), | 136 0, Manifest::kMaxIPCStringLength), |
| 137 related_application.id.is_null()); | 137 related_application.id.is_null()); |
| 138 } | 138 } |
| 139 if (manifest.theme_color < 0) | |
|
nasko
2015/07/17 16:36:18
Can we be a bit more strict? Is it valid for a col
Lalit Maganti
2015/07/18 17:52:05
No it is not valid but we do a cast on the rendere
nasko
2015/07/20 09:22:16
Please do. What we do in the renderer process is i
| |
| 140 manifest.theme_color = -1; | |
|
nasko
2015/07/17 16:36:18
Please don't use integers, use the symbolic consta
| |
| 139 | 141 |
| 140 callback->Run(manifest); | 142 callback->Run(manifest); |
| 141 callbacks->Remove(request_id); | 143 callbacks->Remove(request_id); |
| 142 if (callbacks->IsEmpty()) { | 144 if (callbacks->IsEmpty()) { |
| 143 delete callbacks; | 145 delete callbacks; |
| 144 pending_callbacks_.erase(render_frame_host); | 146 pending_callbacks_.erase(render_frame_host); |
| 145 } | 147 } |
| 146 } | 148 } |
| 147 | 149 |
| 148 } // namespace content | 150 } // namespace content |
| OLD | NEW |