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

Side by Side Diff: chrome/browser/guest_view/extension_options/extension_options_guest.cc

Issue 429763002: Implement createfailed event for <extensionoptions> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add more tests for bad extension id, nonexistent options page Created 6 years, 4 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 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 "chrome/browser/guest_view/extension_options/extension_options_guest.h" 5 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 8 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
9 #include "chrome/browser/guest_view/extension_options/extension_options_constant s.h" 9 #include "chrome/browser/guest_view/extension_options/extension_options_constant s.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 void ExtensionOptionsGuest::CreateWebContents( 60 void ExtensionOptionsGuest::CreateWebContents(
61 const std::string& embedder_extension_id, 61 const std::string& embedder_extension_id,
62 int embedder_render_process_id, 62 int embedder_render_process_id,
63 const base::DictionaryValue& create_params, 63 const base::DictionaryValue& create_params,
64 const WebContentsCreatedCallback& callback) { 64 const WebContentsCreatedCallback& callback) {
65 // Get the extension's base URL. 65 // Get the extension's base URL.
66 std::string extension_id; 66 std::string extension_id;
67 create_params.GetString(extensionoptions::kExtensionId, &extension_id); 67 create_params.GetString(extensionoptions::kExtensionId, &extension_id);
68 if (extension_id.empty()) { 68
69 if (!extensions::Extension::IdIsValid(extension_id)) {
69 callback.Run(NULL); 70 callback.Run(NULL);
70 return; 71 return;
71 } 72 }
72 DCHECK(extensions::Extension::IdIsValid(extension_id)); 73
74 if (extension_id != embedder_extension_id) {
75 callback.Run(NULL);
76 return;
77 }
73 78
74 GURL extension_url = 79 GURL extension_url =
75 extensions::Extension::GetBaseURLFromExtensionId(extension_id); 80 extensions::Extension::GetBaseURLFromExtensionId(extension_id);
76 if (!extension_url.is_valid()) { 81 if (!extension_url.is_valid()) {
77 callback.Run(NULL); 82 callback.Run(NULL);
78 return; 83 return;
79 } 84 }
80 85
81 // Get the options page URL for later use. 86 // Get the options page URL for later use.
82 extensions::ExtensionRegistry* registry = 87 extensions::ExtensionRegistry* registry =
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 IPC_MESSAGE_UNHANDLED(handled = false) 136 IPC_MESSAGE_UNHANDLED(handled = false)
132 IPC_END_MESSAGE_MAP() 137 IPC_END_MESSAGE_MAP()
133 return handled; 138 return handled;
134 } 139 }
135 140
136 void ExtensionOptionsGuest::OnRequest( 141 void ExtensionOptionsGuest::OnRequest(
137 const ExtensionHostMsg_Request_Params& params) { 142 const ExtensionHostMsg_Request_Params& params) {
138 extension_function_dispatcher_->Dispatch( 143 extension_function_dispatcher_->Dispatch(
139 params, guest_web_contents()->GetRenderViewHost()); 144 params, guest_web_contents()->GetRenderViewHost());
140 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698