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

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: Delvin's comments. 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 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 } 866 }
866 867
867 WebViewRendererState::WebViewInfo web_view_info; 868 WebViewRendererState::WebViewInfo web_view_info;
868 web_view_info.embedder_process_id = 869 web_view_info.embedder_process_id =
869 owner_web_contents()->GetRenderProcessHost()->GetID(); 870 owner_web_contents()->GetRenderProcessHost()->GetID();
870 web_view_info.instance_id = view_instance_id(); 871 web_view_info.instance_id = view_instance_id();
871 web_view_info.partition_id = partition_id; 872 web_view_info.partition_id = partition_id;
872 web_view_info.owner_extension_id = owner_extension_id(); 873 web_view_info.owner_extension_id = owner_extension_id();
873 web_view_info.rules_registry_id = rules_registry_id_; 874 web_view_info.rules_registry_id = rules_registry_id_;
874 875
876 // Get content scripts IDs added by the guest.
877 WebViewContentScriptManager* manager =
878 WebViewContentScriptManager::Get(browser_context());
879 if (manager) {
Devlin 2015/04/14 23:04:57 When can this be null?
Xi Han 2015/04/15 19:43:56 Change to DCHECK.
880 web_view_info.content_script_ids = manager->GetContentScriptIDSet(
881 web_view_info.embedder_process_id, web_view_info.instance_id);
882 }
883
875 content::BrowserThread::PostTask( 884 content::BrowserThread::PostTask(
876 content::BrowserThread::IO, 885 content::BrowserThread::IO,
877 FROM_HERE, 886 FROM_HERE,
878 base::Bind(&WebViewRendererState::AddGuest, 887 base::Bind(&WebViewRendererState::AddGuest,
879 base::Unretained(WebViewRendererState::GetInstance()), 888 base::Unretained(WebViewRendererState::GetInstance()),
880 web_contents()->GetRenderProcessHost()->GetID(), 889 web_contents()->GetRenderProcessHost()->GetID(),
881 web_contents()->GetRoutingID(), 890 web_contents()->GetRoutingID(),
882 web_view_info)); 891 web_view_info));
883 } 892 }
884 893
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 1409 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
1401 DispatchEventToView( 1410 DispatchEventToView(
1402 new GuestViewBase::Event(webview::kEventExitFullscreen, args.Pass())); 1411 new GuestViewBase::Event(webview::kEventExitFullscreen, args.Pass()));
1403 } 1412 }
1404 // Since we changed fullscreen state, sending a Resize message ensures that 1413 // Since we changed fullscreen state, sending a Resize message ensures that
1405 // renderer/ sees the change. 1414 // renderer/ sees the change.
1406 web_contents()->GetRenderViewHost()->WasResized(); 1415 web_contents()->GetRenderViewHost()->WasResized();
1407 } 1416 }
1408 1417
1409 } // namespace extensions 1418 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698