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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_guest.cc

Issue 959413003: Implement <webview>.addContentScript/removeContentScript API [1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make the sync_IPC handled in IO thread. Created 5 years, 8 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 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/web_view/web_view_guest.h" 5 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/browser/browser_context.h" 10 #include "content/public/browser/browser_context.h"
(...skipping 19 matching lines...) Expand all
30 #include "content/public/common/result_codes.h" 30 #include "content/public/common/result_codes.h"
31 #include "content/public/common/stop_find_action.h" 31 #include "content/public/common/stop_find_action.h"
32 #include "content/public/common/url_constants.h" 32 #include "content/public/common/url_constants.h"
33 #include "extensions/browser/api/declarative/rules_registry_service.h" 33 #include "extensions/browser/api/declarative/rules_registry_service.h"
34 #include "extensions/browser/api/extensions_api_client.h" 34 #include "extensions/browser/api/extensions_api_client.h"
35 #include "extensions/browser/api/guest_view/web_view/web_view_internal_api.h" 35 #include "extensions/browser/api/guest_view/web_view/web_view_internal_api.h"
36 #include "extensions/browser/api/web_request/web_request_api.h" 36 #include "extensions/browser/api/web_request/web_request_api.h"
37 #include "extensions/browser/extension_system.h" 37 #include "extensions/browser/extension_system.h"
38 #include "extensions/browser/guest_view/guest_view_manager.h" 38 #include "extensions/browser/guest_view/guest_view_manager.h"
39 #include "extensions/browser/guest_view/web_view/web_view_constants.h" 39 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
40 #include "extensions/browser/guest_view/web_view/web_view_content_script_manager .h"
40 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" 41 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
41 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h" 42 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
42 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 43 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
43 #include "extensions/common/constants.h" 44 #include "extensions/common/constants.h"
44 #include "extensions/common/extension_messages.h" 45 #include "extensions/common/extension_messages.h"
45 #include "extensions/common/guest_view/guest_view_constants.h" 46 #include "extensions/common/guest_view/guest_view_constants.h"
46 #include "extensions/strings/grit/extensions_strings.h" 47 #include "extensions/strings/grit/extensions_strings.h"
47 #include "ipc/ipc_message_macros.h" 48 #include "ipc/ipc_message_macros.h"
48 #include "net/base/escape.h" 49 #include "net/base/escape.h"
49 #include "net/base/net_errors.h" 50 #include "net/base/net_errors.h"
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 } 841 }
841 842
842 WebViewRendererState::WebViewInfo web_view_info; 843 WebViewRendererState::WebViewInfo web_view_info;
843 web_view_info.embedder_process_id = 844 web_view_info.embedder_process_id =
844 owner_web_contents()->GetRenderProcessHost()->GetID(); 845 owner_web_contents()->GetRenderProcessHost()->GetID();
845 web_view_info.instance_id = view_instance_id(); 846 web_view_info.instance_id = view_instance_id();
846 web_view_info.partition_id = partition_id; 847 web_view_info.partition_id = partition_id;
847 web_view_info.owner_extension_id = owner_extension_id(); 848 web_view_info.owner_extension_id = owner_extension_id();
848 web_view_info.rules_registry_id = rules_registry_id_; 849 web_view_info.rules_registry_id = rules_registry_id_;
849 850
851 // Get content scripts IDs added by the guest.
852 WebViewContentScriptManager* manager =
853 WebViewContentScriptManager::Get(browser_context());
854 if (manager) {
855 web_view_info.content_script_ids = manager->GetContentScriptIdSet(
856 web_view_info.embedder_process_id, web_view_info.instance_id);
857 }
858
850 content::BrowserThread::PostTask( 859 content::BrowserThread::PostTask(
851 content::BrowserThread::IO, 860 content::BrowserThread::IO,
852 FROM_HERE, 861 FROM_HERE,
853 base::Bind(&WebViewRendererState::AddGuest, 862 base::Bind(&WebViewRendererState::AddGuest,
854 base::Unretained(WebViewRendererState::GetInstance()), 863 base::Unretained(WebViewRendererState::GetInstance()),
855 web_contents()->GetRenderProcessHost()->GetID(), 864 web_contents()->GetRenderProcessHost()->GetID(),
856 web_contents()->GetRoutingID(), 865 web_contents()->GetRoutingID(),
857 web_view_info)); 866 web_view_info));
858 } 867 }
859 868
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 1386 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
1378 DispatchEventToView( 1387 DispatchEventToView(
1379 new GuestViewBase::Event(webview::kEventExitFullscreen, args.Pass())); 1388 new GuestViewBase::Event(webview::kEventExitFullscreen, args.Pass()));
1380 } 1389 }
1381 // Since we changed fullscreen state, sending a Resize message ensures that 1390 // Since we changed fullscreen state, sending a Resize message ensures that
1382 // renderer/ sees the change. 1391 // renderer/ sees the change.
1383 web_contents()->GetRenderViewHost()->WasResized(); 1392 web_contents()->GetRenderViewHost()->WasResized();
1384 } 1393 }
1385 1394
1386 } // namespace extensions 1395 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698