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

Side by Side Diff: chrome/browser/webview/webview_guest.cc

Issue 17165004: <webview>: Partially migrate loadcommit event from content to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed lazyboy@'s comments Created 7 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/webview/webview_guest.h" 5 #include "chrome/browser/webview/webview_guest.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/stringprintf.h"
8 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 9 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
10 #include "chrome/browser/extensions/api/webview/webview_api_constants.h"
11 #include "chrome/browser/extensions/event_router.h"
9 #include "chrome/browser/extensions/extension_renderer_state.h" 12 #include "chrome/browser/extensions/extension_renderer_state.h"
13 #include "chrome/browser/extensions/extension_system.h"
10 #include "chrome/browser/extensions/script_executor.h" 14 #include "chrome/browser/extensions/script_executor.h"
11 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
13 #include "content/public/browser/site_instance.h" 17 #include "content/public/browser/site_instance.h"
14 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
15 19
16 using content::WebContents; 20 using content::WebContents;
17 21
22 namespace keys = webview_api_constants;
23
18 namespace chrome { 24 namespace chrome {
19 25
20 namespace { 26 namespace {
21 27
22 typedef std::map<std::pair<int, int>, WebViewGuest*> WebViewGuestMap; 28 typedef std::map<std::pair<int, int>, WebViewGuest*> WebViewGuestMap;
23 static base::LazyInstance<WebViewGuestMap> webview_guest_map = 29 static base::LazyInstance<WebViewGuestMap> webview_guest_map =
24 LAZY_INSTANCE_INITIALIZER; 30 LAZY_INSTANCE_INITIALIZER;
25 31
26 void RemoveWebViewEventListenersOnIOThread( 32 void RemoveWebViewEventListenersOnIOThread(
27 void* profile, 33 void* profile,
(...skipping 29 matching lines...) Expand all
57 63
58 // static 64 // static
59 WebViewGuest* WebViewGuest::From(int embedder_process_id, 65 WebViewGuest* WebViewGuest::From(int embedder_process_id,
60 int guest_instance_id) { 66 int guest_instance_id) {
61 WebViewGuestMap* guest_map = webview_guest_map.Pointer(); 67 WebViewGuestMap* guest_map = webview_guest_map.Pointer();
62 WebViewGuestMap::iterator it = guest_map->find( 68 WebViewGuestMap::iterator it = guest_map->find(
63 std::make_pair(embedder_process_id, guest_instance_id)); 69 std::make_pair(embedder_process_id, guest_instance_id));
64 return it == guest_map->end() ? NULL : it->second; 70 return it == guest_map->end() ? NULL : it->second;
65 } 71 }
66 72
73 void WebViewGuest::DispatchEvent(const std::string& event_name,
74 scoped_ptr<DictionaryValue> event) {
75 Profile* profile = Profile::FromBrowserContext(
76 web_contents()->GetBrowserContext());
77
78 extensions::EventFilteringInfo info;
79 info.SetURL(GURL());
80 info.SetInstanceID(guest_instance_id_);
81 scoped_ptr<ListValue> args(new ListValue());
82 args->Append(event.release());
83
84 extensions::EventRouter::DispatchEvent(
85 embedder_web_contents_, profile, extension_id_,
86 base::StringPrintf("webview.on%s", event_name.c_str()), args.Pass(),
87 extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
88 }
89
67 WebViewGuest::~WebViewGuest() { 90 WebViewGuest::~WebViewGuest() {
68 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 91 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
69 webview_guest_map.Get().erase(key); 92 webview_guest_map.Get().erase(key);
70 } 93 }
71 94
95 void WebViewGuest::DidCommitProvisionalLoadForFrame(
96 int64 frame_id,
97 bool is_main_frame,
98 const GURL& url,
99 content::PageTransition transition_type,
100 content::RenderViewHost* render_view_host) {
101 scoped_ptr<DictionaryValue> event(new DictionaryValue());
102 event->SetString(keys::kUrl, url.spec());
103 event->SetBoolean(keys::kIsTopLevel, is_main_frame);
104 DispatchEvent(keys::kEventLoadCommit, event.Pass());
105 }
106
72 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) { 107 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
73 RemoveWebViewFromExtensionRendererState(web_contents); 108 RemoveWebViewFromExtensionRendererState(web_contents);
109 extensions::EventRouter* router =
110 extensions::ExtensionSystem::Get(static_cast<Profile*>(profile_))->
111 event_router();
112 router->RemoveEventListener("webview.onloadcommit",
113 embedder_web_contents_->GetRenderProcessHost(),
114 extension_id_);
74 content::BrowserThread::PostTask( 115 content::BrowserThread::PostTask(
75 content::BrowserThread::IO, 116 content::BrowserThread::IO,
76 FROM_HERE, 117 FROM_HERE,
77 base::Bind( 118 base::Bind(
78 &RemoveWebViewEventListenersOnIOThread, 119 &RemoveWebViewEventListenersOnIOThread,
79 profile_, extension_id_, 120 profile_, extension_id_,
80 embedder_render_process_id_, 121 embedder_render_process_id_,
81 webview_instance_id_)); 122 webview_instance_id_));
82 delete this; 123 delete this;
83 } 124 }
(...skipping 22 matching lines...) Expand all
106 content::BrowserThread::PostTask( 147 content::BrowserThread::PostTask(
107 content::BrowserThread::IO, FROM_HERE, 148 content::BrowserThread::IO, FROM_HERE,
108 base::Bind( 149 base::Bind(
109 &ExtensionRendererState::RemoveWebView, 150 &ExtensionRendererState::RemoveWebView,
110 base::Unretained(ExtensionRendererState::GetInstance()), 151 base::Unretained(ExtensionRendererState::GetInstance()),
111 web_contents->GetRenderProcessHost()->GetID(), 152 web_contents->GetRenderProcessHost()->GetID(),
112 web_contents->GetRoutingID())); 153 web_contents->GetRoutingID()));
113 } 154 }
114 155
115 } // namespace chrome 156 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698