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

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

Issue 2846743002: Switch SupportsUserData uses to use unique_ptr. (Closed)
Patch Set: Created 3 years, 7 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 | « extensions/browser/blob_holder.cc ('k') | extensions/browser/view_type_utils.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_content_script_manager .h" 5 #include "extensions/browser/guest_view/web_view/web_view_content_script_manager .h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "content/public/browser/browser_context.h" 8 #include "content/public/browser/browser_context.h"
8 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
9 #include "content/public/browser/navigation_details.h" 10 #include "content/public/browser/navigation_details.h"
10 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
11 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
12 #include "extensions/browser/declarative_user_script_manager.h" 13 #include "extensions/browser/declarative_user_script_manager.h"
13 #include "extensions/browser/declarative_user_script_master.h" 14 #include "extensions/browser/declarative_user_script_master.h"
14 #include "extensions/browser/extension_system.h" 15 #include "extensions/browser/extension_system.h"
15 #include "extensions/browser/guest_view/web_view/web_view_constants.h" 16 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
16 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 17 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
(...skipping 12 matching lines...) Expand all
29 30
30 WebViewContentScriptManager* WebViewContentScriptManager::Get( 31 WebViewContentScriptManager* WebViewContentScriptManager::Get(
31 content::BrowserContext* browser_context) { 32 content::BrowserContext* browser_context) {
32 DCHECK_CURRENTLY_ON(BrowserThread::UI); 33 DCHECK_CURRENTLY_ON(BrowserThread::UI);
33 WebViewContentScriptManager* manager = 34 WebViewContentScriptManager* manager =
34 static_cast<WebViewContentScriptManager*>(browser_context->GetUserData( 35 static_cast<WebViewContentScriptManager*>(browser_context->GetUserData(
35 webview::kWebViewContentScriptManagerKeyName)); 36 webview::kWebViewContentScriptManagerKeyName));
36 if (!manager) { 37 if (!manager) {
37 manager = new WebViewContentScriptManager(browser_context); 38 manager = new WebViewContentScriptManager(browser_context);
38 browser_context->SetUserData(webview::kWebViewContentScriptManagerKeyName, 39 browser_context->SetUserData(webview::kWebViewContentScriptManagerKeyName,
39 manager); 40 base::WrapUnique(manager));
40 } 41 }
41 return manager; 42 return manager;
42 } 43 }
43 44
44 void WebViewContentScriptManager::AddContentScripts( 45 void WebViewContentScriptManager::AddContentScripts(
45 int embedder_process_id, 46 int embedder_process_id,
46 content::RenderFrameHost* render_frame_host, 47 content::RenderFrameHost* render_frame_host,
47 int view_instance_id, 48 int view_instance_id,
48 const HostID& host_id, 49 const HostID& host_id,
49 std::unique_ptr<UserScriptList> scripts) { 50 std::unique_ptr<UserScriptList> scripts) {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 243
243 void WebViewContentScriptManager::RunCallbacksIfReady() { 244 void WebViewContentScriptManager::RunCallbacksIfReady() {
244 if (user_script_loader_observer_.IsObservingSources()) 245 if (user_script_loader_observer_.IsObservingSources())
245 return; 246 return;
246 for (auto& callback : pending_scripts_loading_callbacks_) 247 for (auto& callback : pending_scripts_loading_callbacks_)
247 callback.Run(); 248 callback.Run();
248 pending_scripts_loading_callbacks_.clear(); 249 pending_scripts_loading_callbacks_.clear();
249 } 250 }
250 251
251 } // namespace extensions 252 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/blob_holder.cc ('k') | extensions/browser/view_type_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698