Chromium Code Reviews| Index: chrome/browser/guest_view/extension_options/extension_options_guest.cc |
| diff --git a/chrome/browser/guest_view/extension_options/extension_options_guest.cc b/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
| index 3ca78ecfec820868a02aace06a3c3d6843d8e715..bb2f340b332549cdd24b65f6ddf81f03d75acb03 100644 |
| --- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
| +++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
| @@ -64,9 +64,11 @@ void ExtensionOptionsGuest::CreateWebContents( |
| return; |
| } |
| - if (extension_id != embedder_extension_id) { |
| - callback.Run(NULL); |
| - return; |
| + if (!embedder_extension_id.empty()) { |
| + if (extension_id != embedder_extension_id) { |
|
not at google - send to devlin
2014/08/12 00:08:23
how about:
if (extensions::Extension::IdIsValid(e
ericzeng
2014/08/12 00:32:26
Done.
|
| + callback.Run(NULL); |
| + return; |
| + } |
| } |
| GURL extension_url = |
| @@ -154,7 +156,7 @@ bool ExtensionOptionsGuest::IsAutoSizeSupported() const { |
| void ExtensionOptionsGuest::SetUpAutoSize() { |
| // Read the autosize parameters passed in from the embedder. |
| - bool auto_size_enabled; |
| + bool auto_size_enabled = false; |
| extra_params()->GetBoolean(extensionoptions::kAttributeAutoSize, |
| &auto_size_enabled); |