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

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: Merge with ToT 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
« no previous file with comments | « chrome/browser/webview/webview_guest.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/extensions/api/web_request/web_request_api.h" 8 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
9 #include "chrome/browser/extensions/event_router.h"
9 #include "chrome/browser/extensions/extension_renderer_state.h" 10 #include "chrome/browser/extensions/extension_renderer_state.h"
11 #include "chrome/browser/extensions/extension_system.h"
10 #include "chrome/browser/extensions/script_executor.h" 12 #include "chrome/browser/extensions/script_executor.h"
11 #include "chrome/browser/webview/webview_constants.h" 13 #include "chrome/browser/webview/webview_constants.h"
12 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/site_instance.h" 16 #include "content/public/browser/site_instance.h"
15 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
16 18
17 using content::WebContents; 19 using content::WebContents;
18 20
19 namespace keys = webview_constants;
20
21 namespace chrome {
22
23 namespace { 21 namespace {
24 22
25 typedef std::map<std::pair<int, int>, WebViewGuest*> WebViewGuestMap; 23 typedef std::map<std::pair<int, int>, WebViewGuest*> WebViewGuestMap;
26 static base::LazyInstance<WebViewGuestMap> webview_guest_map = 24 base::LazyInstance<WebViewGuestMap> webview_guest_map =
27 LAZY_INSTANCE_INITIALIZER; 25 LAZY_INSTANCE_INITIALIZER;
28 26
29 void RemoveWebViewEventListenersOnIOThread( 27 void RemoveWebViewEventListenersOnIOThread(
30 void* profile, 28 void* profile,
31 const std::string& extension_id, 29 const std::string& extension_id,
32 int embedder_process_id, 30 int embedder_process_id,
33 int guest_instance_id) { 31 int guest_instance_id) {
34 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 32 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
35 ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners( 33 ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
36 profile, extension_id, embedder_process_id, guest_instance_id); 34 profile, extension_id, embedder_process_id, guest_instance_id);
37 } 35 }
38 36
39 } // namespace 37 } // namespace
40 38
41 WebViewGuest::WebViewGuest(WebContents* guest_web_contents, 39 WebViewGuest::WebViewGuest(WebContents* guest_web_contents,
42 WebContents* embedder_web_contents, 40 WebContents* embedder_web_contents,
43 const std::string& extension_id, 41 const std::string& extension_id,
44 int webview_instance_id, 42 int webview_instance_id,
45 const base::DictionaryValue& args) 43 const base::DictionaryValue& args)
46 : WebContentsObserver(guest_web_contents), 44 : WebContentsObserver(guest_web_contents),
47 embedder_web_contents_(embedder_web_contents), 45 embedder_web_contents_(embedder_web_contents),
48 extension_id_(extension_id), 46 extension_id_(extension_id),
49 embedder_render_process_id_( 47 embedder_render_process_id_(
50 embedder_web_contents->GetRenderProcessHost()->GetID()), 48 embedder_web_contents->GetRenderProcessHost()->GetID()),
51 profile_(guest_web_contents->GetBrowserContext()), 49 profile_(guest_web_contents->GetBrowserContext()),
52 guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()), 50 guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
53 webview_instance_id_(webview_instance_id), 51 webview_instance_id_(webview_instance_id),
54 script_executor_(new extensions::ScriptExecutor(guest_web_contents, 52 script_executor_(new extensions::ScriptExecutor(guest_web_contents,
55 &script_observers_)) { 53 &script_observers_)) {
56 std::string api_name;
57 DCHECK(args.GetString(keys::kAttributeApi, &api_name));
58 DCHECK_EQ("webview", api_name);
59 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 54 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
60 webview_guest_map.Get().insert(std::make_pair(key, this)); 55 webview_guest_map.Get().insert(std::make_pair(key, this));
61 56
62 AddWebViewToExtensionRendererState(); 57 AddWebViewToExtensionRendererState();
63 } 58 }
64 59
65 // static 60 // static
66 WebViewGuest* WebViewGuest::From(int embedder_process_id, 61 WebViewGuest* WebViewGuest::From(int embedder_process_id,
67 int guest_instance_id) { 62 int guest_instance_id) {
68 WebViewGuestMap* guest_map = webview_guest_map.Pointer(); 63 WebViewGuestMap* guest_map = webview_guest_map.Pointer();
69 WebViewGuestMap::iterator it = guest_map->find( 64 WebViewGuestMap::iterator it = guest_map->find(
70 std::make_pair(embedder_process_id, guest_instance_id)); 65 std::make_pair(embedder_process_id, guest_instance_id));
71 return it == guest_map->end() ? NULL : it->second; 66 return it == guest_map->end() ? NULL : it->second;
72 } 67 }
73 68
74 WebViewGuest::~WebViewGuest() { 69 WebViewGuest::~WebViewGuest() {
75 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 70 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
76 webview_guest_map.Get().erase(key); 71 webview_guest_map.Get().erase(key);
77 } 72 }
78 73
74 void WebViewGuest::DispatchEvent(const std::string& event_name,
75 scoped_ptr<DictionaryValue> event) {
76 Profile* profile = Profile::FromBrowserContext(
77 web_contents()->GetBrowserContext());
78
79 extensions::EventFilteringInfo info;
80 info.SetURL(GURL());
81 info.SetInstanceID(guest_instance_id_);
82 scoped_ptr<ListValue> args(new ListValue());
83 args->Append(event.release());
84
85 extensions::EventRouter::DispatchEvent(
86 embedder_web_contents_, profile, extension_id_,
87 event_name, args.Pass(),
88 extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
89 }
90
91 void WebViewGuest::DidCommitProvisionalLoadForFrame(
92 int64 frame_id,
93 bool is_main_frame,
94 const GURL& url,
95 content::PageTransition transition_type,
96 content::RenderViewHost* render_view_host) {
97 scoped_ptr<DictionaryValue> event(new DictionaryValue());
98 event->SetString(webview::kUrl, url.spec());
99 event->SetBoolean(webview::kIsTopLevel, is_main_frame);
100 DispatchEvent(webview::kEventLoadCommit, event.Pass());
101 }
102
79 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) { 103 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
80 RemoveWebViewFromExtensionRendererState(web_contents); 104 RemoveWebViewFromExtensionRendererState(web_contents);
81 content::BrowserThread::PostTask( 105 content::BrowserThread::PostTask(
82 content::BrowserThread::IO, 106 content::BrowserThread::IO,
83 FROM_HERE, 107 FROM_HERE,
84 base::Bind( 108 base::Bind(
85 &RemoveWebViewEventListenersOnIOThread, 109 &RemoveWebViewEventListenersOnIOThread,
86 profile_, extension_id_, 110 profile_, extension_id_,
87 embedder_render_process_id_, 111 embedder_render_process_id_,
88 webview_instance_id_)); 112 webview_instance_id_));
(...skipping 22 matching lines...) Expand all
111 void WebViewGuest::RemoveWebViewFromExtensionRendererState( 135 void WebViewGuest::RemoveWebViewFromExtensionRendererState(
112 WebContents* web_contents) { 136 WebContents* web_contents) {
113 content::BrowserThread::PostTask( 137 content::BrowserThread::PostTask(
114 content::BrowserThread::IO, FROM_HERE, 138 content::BrowserThread::IO, FROM_HERE,
115 base::Bind( 139 base::Bind(
116 &ExtensionRendererState::RemoveWebView, 140 &ExtensionRendererState::RemoveWebView,
117 base::Unretained(ExtensionRendererState::GetInstance()), 141 base::Unretained(ExtensionRendererState::GetInstance()),
118 web_contents->GetRenderProcessHost()->GetID(), 142 web_contents->GetRenderProcessHost()->GetID(),
119 web_contents->GetRoutingID())); 143 web_contents->GetRoutingID()));
120 } 144 }
121
122 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/webview/webview_guest.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698