| 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 "extensions/browser/guest_view/extension_options/extension_options_gues
     t.h" | 5 #include "extensions/browser/guest_view/extension_options/extension_options_gues
     t.h" | 
| 6 | 6 | 
| 7 #include "base/metrics/user_metrics.h" |  | 
| 8 #include "base/values.h" | 7 #include "base/values.h" | 
| 9 #include "components/crx_file/id_util.h" | 8 #include "components/crx_file/id_util.h" | 
| 10 #include "content/public/browser/navigation_details.h" | 9 #include "content/public/browser/navigation_details.h" | 
| 11 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" | 
| 12 #include "content/public/browser/site_instance.h" | 11 #include "content/public/browser/site_instance.h" | 
| 13 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" | 
| 14 #include "content/public/common/result_codes.h" | 13 #include "content/public/common/result_codes.h" | 
| 15 #include "extensions/browser/api/extensions_api_client.h" | 14 #include "extensions/browser/api/extensions_api_client.h" | 
|  | 15 #include "extensions/browser/bad_message.h" | 
| 16 #include "extensions/browser/extension_function_dispatcher.h" | 16 #include "extensions/browser/extension_function_dispatcher.h" | 
| 17 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" | 
| 18 #include "extensions/browser/extension_web_contents_observer.h" | 18 #include "extensions/browser/extension_web_contents_observer.h" | 
| 19 #include "extensions/browser/guest_view/extension_options/extension_options_cons
     tants.h" | 19 #include "extensions/browser/guest_view/extension_options/extension_options_cons
     tants.h" | 
| 20 #include "extensions/browser/guest_view/extension_options/extension_options_gues
     t_delegate.h" | 20 #include "extensions/browser/guest_view/extension_options/extension_options_gues
     t_delegate.h" | 
| 21 #include "extensions/browser/guest_view/guest_view_manager.h" | 21 #include "extensions/browser/guest_view/guest_view_manager.h" | 
| 22 #include "extensions/common/api/extension_options_internal.h" | 22 #include "extensions/common/api/extension_options_internal.h" | 
| 23 #include "extensions/common/constants.h" | 23 #include "extensions/common/constants.h" | 
| 24 #include "extensions/common/extension.h" | 24 #include "extensions/common/extension.h" | 
| 25 #include "extensions/common/extension_messages.h" | 25 #include "extensions/common/extension_messages.h" | 
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 217                                ui::PAGE_TRANSITION_LINK, | 217                                ui::PAGE_TRANSITION_LINK, | 
| 218                                false)); | 218                                false)); | 
| 219   } | 219   } | 
| 220   return false; | 220   return false; | 
| 221 } | 221 } | 
| 222 | 222 | 
| 223 void ExtensionOptionsGuest::DidNavigateMainFrame( | 223 void ExtensionOptionsGuest::DidNavigateMainFrame( | 
| 224     const content::LoadCommittedDetails& details, | 224     const content::LoadCommittedDetails& details, | 
| 225     const content::FrameNavigateParams& params) { | 225     const content::FrameNavigateParams& params) { | 
| 226   if (attached() && (params.url.GetOrigin() != options_page_.GetOrigin())) { | 226   if (attached() && (params.url.GetOrigin() != options_page_.GetOrigin())) { | 
| 227     base::RecordAction(base::UserMetricsAction("BadMessageTerminate_EOG")); | 227     bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), | 
| 228     web_contents()->GetRenderProcessHost()->Shutdown( | 228                                     bad_message::EOG_BAD_ORIGIN); | 
| 229         content::RESULT_CODE_KILLED_BAD_MESSAGE, false /* wait */); |  | 
| 230   } | 229   } | 
| 231 } | 230 } | 
| 232 | 231 | 
| 233 bool ExtensionOptionsGuest::OnMessageReceived(const IPC::Message& message) { | 232 bool ExtensionOptionsGuest::OnMessageReceived(const IPC::Message& message) { | 
| 234   bool handled = true; | 233   bool handled = true; | 
| 235   IPC_BEGIN_MESSAGE_MAP(ExtensionOptionsGuest, message) | 234   IPC_BEGIN_MESSAGE_MAP(ExtensionOptionsGuest, message) | 
| 236     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) | 235     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) | 
| 237     IPC_MESSAGE_UNHANDLED(handled = false) | 236     IPC_MESSAGE_UNHANDLED(handled = false) | 
| 238   IPC_END_MESSAGE_MAP() | 237   IPC_END_MESSAGE_MAP() | 
| 239   return handled; | 238   return handled; | 
| 240 } | 239 } | 
| 241 | 240 | 
| 242 void ExtensionOptionsGuest::OnRequest( | 241 void ExtensionOptionsGuest::OnRequest( | 
| 243     const ExtensionHostMsg_Request_Params& params) { | 242     const ExtensionHostMsg_Request_Params& params) { | 
| 244   extension_function_dispatcher_->Dispatch(params, | 243   extension_function_dispatcher_->Dispatch(params, | 
| 245                                            web_contents()->GetRenderViewHost()); | 244                                            web_contents()->GetRenderViewHost()); | 
| 246 } | 245 } | 
| 247 | 246 | 
| 248 }  // namespace extensions | 247 }  // namespace extensions | 
| OLD | NEW | 
|---|