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

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
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; 21 namespace keys = webview_constants;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 WebViewGuestMap::iterator it = guest_map->find( 71 WebViewGuestMap::iterator it = guest_map->find(
70 std::make_pair(embedder_process_id, guest_instance_id)); 72 std::make_pair(embedder_process_id, guest_instance_id));
71 return it == guest_map->end() ? NULL : it->second; 73 return it == guest_map->end() ? NULL : it->second;
72 } 74 }
73 75
74 WebViewGuest::~WebViewGuest() { 76 WebViewGuest::~WebViewGuest() {
75 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 77 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
76 webview_guest_map.Get().erase(key); 78 webview_guest_map.Get().erase(key);
77 } 79 }
78 80
81 void WebViewGuest::DispatchEvent(const std::string& event_name,
82 scoped_ptr<DictionaryValue> event) {
83 Profile* profile = Profile::FromBrowserContext(
84 web_contents()->GetBrowserContext());
85
86 extensions::EventFilteringInfo info;
87 info.SetURL(GURL());
88 info.SetInstanceID(guest_instance_id_);
89 scoped_ptr<ListValue> args(new ListValue());
90 args->Append(event.release());
91
92 extensions::EventRouter::DispatchEvent(
93 embedder_web_contents_, profile, extension_id_,
94 event_name, args.Pass(),
95 extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
96 }
97
98 void WebViewGuest::DidCommitProvisionalLoadForFrame(
99 int64 frame_id,
100 bool is_main_frame,
101 const GURL& url,
102 content::PageTransition transition_type,
103 content::RenderViewHost* render_view_host) {
104 scoped_ptr<DictionaryValue> event(new DictionaryValue());
105 event->SetString(keys::kUrl, url.spec());
106 event->SetBoolean(keys::kIsTopLevel, is_main_frame);
107 DispatchEvent(keys::kEventLoadCommit, event.Pass());
108 }
109
79 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) { 110 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
80 RemoveWebViewFromExtensionRendererState(web_contents); 111 RemoveWebViewFromExtensionRendererState(web_contents);
81 content::BrowserThread::PostTask( 112 content::BrowserThread::PostTask(
82 content::BrowserThread::IO, 113 content::BrowserThread::IO,
83 FROM_HERE, 114 FROM_HERE,
84 base::Bind( 115 base::Bind(
85 &RemoveWebViewEventListenersOnIOThread, 116 &RemoveWebViewEventListenersOnIOThread,
86 profile_, extension_id_, 117 profile_, extension_id_,
87 embedder_render_process_id_, 118 embedder_render_process_id_,
88 webview_instance_id_)); 119 webview_instance_id_));
(...skipping 24 matching lines...) Expand all
113 content::BrowserThread::PostTask( 144 content::BrowserThread::PostTask(
114 content::BrowserThread::IO, FROM_HERE, 145 content::BrowserThread::IO, FROM_HERE,
115 base::Bind( 146 base::Bind(
116 &ExtensionRendererState::RemoveWebView, 147 &ExtensionRendererState::RemoveWebView,
117 base::Unretained(ExtensionRendererState::GetInstance()), 148 base::Unretained(ExtensionRendererState::GetInstance()),
118 web_contents->GetRenderProcessHost()->GetID(), 149 web_contents->GetRenderProcessHost()->GetID(),
119 web_contents->GetRoutingID())); 150 web_contents->GetRoutingID()));
120 } 151 }
121 152
122 } // namespace chrome 153 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698