| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_view/extension_view_guest.h" | 5 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" | 
| 6 | 6 | 
| 7 #include "base/metrics/user_metrics.h" |  | 
| 8 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" | 
| 9 #include "components/crx_file/id_util.h" | 8 #include "components/crx_file/id_util.h" | 
| 10 #include "content/public/browser/render_process_host.h" | 9 #include "content/public/browser/render_process_host.h" | 
| 11 #include "content/public/common/result_codes.h" | 10 #include "content/public/common/result_codes.h" | 
| 12 #include "extensions/browser/api/extensions_api_client.h" | 11 #include "extensions/browser/api/extensions_api_client.h" | 
|  | 12 #include "extensions/browser/bad_message.h" | 
| 13 #include "extensions/browser/guest_view/extension_view/extension_view_constants.
     h" | 13 #include "extensions/browser/guest_view/extension_view/extension_view_constants.
     h" | 
| 14 #include "extensions/common/constants.h" | 14 #include "extensions/common/constants.h" | 
| 15 #include "extensions/common/extension_messages.h" | 15 #include "extensions/common/extension_messages.h" | 
| 16 #include "extensions/strings/grit/extensions_strings.h" | 16 #include "extensions/strings/grit/extensions_strings.h" | 
| 17 | 17 | 
| 18 using content::WebContents; | 18 using content::WebContents; | 
| 19 using namespace extensions::core_api; | 19 using namespace extensions::core_api; | 
| 20 | 20 | 
| 21 namespace extensions { | 21 namespace extensions { | 
| 22 | 22 | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 142   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 142   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 
| 143   args->SetString(guestview::kUrl, relative_url); | 143   args->SetString(guestview::kUrl, relative_url); | 
| 144   DispatchEventToView( | 144   DispatchEventToView( | 
| 145       new GuestViewBase::Event(extensionview::kEventLoadCommit, args.Pass())); | 145       new GuestViewBase::Event(extensionview::kEventLoadCommit, args.Pass())); | 
| 146 } | 146 } | 
| 147 | 147 | 
| 148 void ExtensionViewGuest::DidNavigateMainFrame( | 148 void ExtensionViewGuest::DidNavigateMainFrame( | 
| 149     const content::LoadCommittedDetails& details, | 149     const content::LoadCommittedDetails& details, | 
| 150     const content::FrameNavigateParams& params) { | 150     const content::FrameNavigateParams& params) { | 
| 151   if (attached() && (params.url.GetOrigin() != view_page_.GetOrigin())) { | 151   if (attached() && (params.url.GetOrigin() != view_page_.GetOrigin())) { | 
| 152     base::RecordAction(base::UserMetricsAction("BadMessageTerminate_EVG")); | 152     bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), | 
| 153     web_contents()->GetRenderProcessHost()->Shutdown( | 153                                     bad_message::EVG_BAD_ORIGIN); | 
| 154         content::RESULT_CODE_KILLED_BAD_MESSAGE, false /* wait */); |  | 
| 155   } | 154   } | 
| 156 } | 155 } | 
| 157 | 156 | 
| 158 bool ExtensionViewGuest::OnMessageReceived(const IPC::Message& message) { | 157 bool ExtensionViewGuest::OnMessageReceived(const IPC::Message& message) { | 
| 159   bool handled = true; | 158   bool handled = true; | 
| 160   IPC_BEGIN_MESSAGE_MAP(ExtensionViewGuest, message) | 159   IPC_BEGIN_MESSAGE_MAP(ExtensionViewGuest, message) | 
| 161   IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) | 160   IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) | 
| 162   IPC_MESSAGE_UNHANDLED(handled = false) | 161   IPC_MESSAGE_UNHANDLED(handled = false) | 
| 163   IPC_END_MESSAGE_MAP() | 162   IPC_END_MESSAGE_MAP() | 
| 164   return handled; | 163   return handled; | 
| 165 } | 164 } | 
| 166 | 165 | 
| 167 // Private | 166 // Private | 
| 168 void ExtensionViewGuest::OnRequest( | 167 void ExtensionViewGuest::OnRequest( | 
| 169     const ExtensionHostMsg_Request_Params& params) { | 168     const ExtensionHostMsg_Request_Params& params) { | 
| 170   extension_function_dispatcher_->Dispatch(params, | 169   extension_function_dispatcher_->Dispatch(params, | 
| 171                                            web_contents()->GetRenderViewHost()); | 170                                            web_contents()->GetRenderViewHost()); | 
| 172 } | 171 } | 
| 173 | 172 | 
| 174 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) { | 173 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) { | 
| 175   std::string src; | 174   std::string src; | 
| 176   params.GetString(extensionview::kAttributeSrc, &src); | 175   params.GetString(extensionview::kAttributeSrc, &src); | 
| 177   NavigateGuest(src, false /* force_navigation */); | 176   NavigateGuest(src, false /* force_navigation */); | 
| 178 } | 177 } | 
| 179 | 178 | 
| 180 }  // namespace extensions | 179 }  // namespace extensions | 
| OLD | NEW | 
|---|