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

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

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 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 | « chrome/browser/extensions/extension_service.h ('k') | chrome/chrome_browser_extensions.gypi » ('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 (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/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 } 1218 }
1219 1219
1220 ExtensionPrefs* ExtensionService::extension_prefs() { 1220 ExtensionPrefs* ExtensionService::extension_prefs() {
1221 return extension_prefs_; 1221 return extension_prefs_;
1222 } 1222 }
1223 1223
1224 extensions::SettingsFrontend* ExtensionService::settings_frontend() { 1224 extensions::SettingsFrontend* ExtensionService::settings_frontend() {
1225 return settings_frontend_.get(); 1225 return settings_frontend_.get();
1226 } 1226 }
1227 1227
1228 ExtensionContentSettingsStore* 1228 extensions::ContentSettingsStore* ExtensionService::GetContentSettingsStore() {
1229 ExtensionService::GetExtensionContentSettingsStore() {
1230 return extension_prefs()->content_settings_store(); 1229 return extension_prefs()->content_settings_store();
1231 } 1230 }
1232 1231
1233 bool ExtensionService::is_ready() { 1232 bool ExtensionService::is_ready() {
1234 return ready_; 1233 return ready_;
1235 } 1234 }
1236 1235
1237 extensions::ExtensionUpdater* ExtensionService::updater() { 1236 extensions::ExtensionUpdater* ExtensionService::updater() {
1238 return updater_.get(); 1237 return updater_.get();
1239 } 1238 }
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after
2638 // To coexist with certain unit tests that don't have an IO thread message 2637 // To coexist with certain unit tests that don't have an IO thread message
2639 // loop available at ExtensionService shutdown, we lazy-initialize this 2638 // loop available at ExtensionService shutdown, we lazy-initialize this
2640 // object so that those cases neither create nor destroy an 2639 // object so that those cases neither create nor destroy an
2641 // APIResourceController. 2640 // APIResourceController.
2642 CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2641 CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2643 if (!api_resource_controller_) { 2642 if (!api_resource_controller_) {
2644 api_resource_controller_ = new extensions::APIResourceController(); 2643 api_resource_controller_ = new extensions::APIResourceController();
2645 } 2644 }
2646 return api_resource_controller_; 2645 return api_resource_controller_;
2647 } 2646 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698