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

Side by Side Diff: chrome/browser/extensions/tab_helper.cc

Issue 13825014: Change RulesRegistryService to use ProfileKeyedAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved functionality from InitForOTR into RulesRegistryService constructor Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/tab_helper.h" 5 #include "chrome/browser/extensions/tab_helper.h"
6 6
7 #include "chrome/browser/extensions/activity_log.h" 7 #include "chrome/browser/extensions/activity_log.h"
8 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h" 8 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
9 #include "chrome/browser/extensions/api/declarative_content/content_rules_regist ry.h" 9 #include "chrome/browser/extensions/api/declarative_content/content_rules_regist ry.h"
10 #include "chrome/browser/extensions/crx_installer.h" 10 #include "chrome/browser/extensions/crx_installer.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 TabHelper::TabHelper(content::WebContents* web_contents) 80 TabHelper::TabHelper(content::WebContents* web_contents)
81 : content::WebContentsObserver(web_contents), 81 : content::WebContentsObserver(web_contents),
82 extension_app_(NULL), 82 extension_app_(NULL),
83 extension_function_dispatcher_( 83 extension_function_dispatcher_(
84 Profile::FromBrowserContext(web_contents->GetBrowserContext()), this), 84 Profile::FromBrowserContext(web_contents->GetBrowserContext()), this),
85 pending_web_app_action_(NONE), 85 pending_web_app_action_(NONE),
86 script_executor_(new ScriptExecutor(web_contents, 86 script_executor_(new ScriptExecutor(web_contents,
87 &script_execution_observers_)), 87 &script_execution_observers_)),
88 rules_registry_service_( 88 rules_registry_service_(RulesRegistryService::Get(
89 ExtensionSystem::Get( 89 Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
90 Profile::FromBrowserContext(web_contents->GetBrowserContext()))->
91 rules_registry_service()),
92 image_loader_ptr_factory_(this) { 90 image_loader_ptr_factory_(this) {
93 // The ActiveTabPermissionManager requires a session ID; ensure this 91 // The ActiveTabPermissionManager requires a session ID; ensure this
94 // WebContents has one. 92 // WebContents has one.
95 SessionTabHelper::CreateForWebContents(web_contents); 93 SessionTabHelper::CreateForWebContents(web_contents);
96 active_tab_permission_granter_.reset(new ActiveTabPermissionGranter( 94 active_tab_permission_granter_.reset(new ActiveTabPermissionGranter(
97 web_contents, 95 web_contents,
98 SessionID::IdForTab(web_contents), 96 SessionID::IdForTab(web_contents),
99 Profile::FromBrowserContext(web_contents->GetBrowserContext()))); 97 Profile::FromBrowserContext(web_contents->GetBrowserContext())));
100 if (FeatureSwitch::script_badges()->IsEnabled()) { 98 if (FeatureSwitch::script_badges()->IsEnabled()) {
101 location_bar_controller_.reset( 99 location_bar_controller_.reset(
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 script_bubble_controller_->OnExtensionUnloaded( 452 script_bubble_controller_->OnExtensionUnloaded(
455 content::Details<extensions::UnloadedExtensionInfo>( 453 content::Details<extensions::UnloadedExtensionInfo>(
456 details)->extension->id()); 454 details)->extension->id());
457 break; 455 break;
458 } 456 }
459 } 457 }
460 } 458 }
461 } 459 }
462 460
463 } // namespace extensions 461 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698