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

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

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 411
412 bool show_extensions_prompts() { 412 bool show_extensions_prompts() {
413 return show_extensions_prompts_; 413 return show_extensions_prompts_;
414 } 414 }
415 415
416 Profile* profile(); 416 Profile* profile();
417 417
418 // Returns profile_ as a BrowserContext. 418 // Returns profile_ as a BrowserContext.
419 content::BrowserContext* GetBrowserContext() const; 419 content::BrowserContext* GetBrowserContext() const;
420 420
421 // TODO(skerner): Change to const ExtensionPrefs& extension_prefs() const,
422 // ExtensionPrefs* mutable_extension_prefs().
423 extensions::ExtensionPrefs* extension_prefs();
424 const extensions::ExtensionPrefs* extension_prefs() const;
425
426 extensions::SettingsFrontend* settings_frontend(); 421 extensions::SettingsFrontend* settings_frontend();
427 422
428 void set_extension_sync_service( 423 void set_extension_sync_service(
429 ExtensionSyncService* extension_sync_service) { 424 ExtensionSyncService* extension_sync_service) {
430 extension_sync_service_ = extension_sync_service; 425 extension_sync_service_ = extension_sync_service;
431 } 426 }
432 427
433 extensions::ContentSettingsStore* GetContentSettingsStore(); 428 extensions::ContentSettingsStore* GetContentSettingsStore();
434 429
435 // Whether the extension service is ready. 430 // Whether the extension service is ready.
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 848 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
854 GreylistedExtensionDisabled); 849 GreylistedExtensionDisabled);
855 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 850 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
856 GreylistDontEnableManuallyDisabled); 851 GreylistDontEnableManuallyDisabled);
857 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 852 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
858 GreylistUnknownDontChange); 853 GreylistUnknownDontChange);
859 DISALLOW_COPY_AND_ASSIGN(ExtensionService); 854 DISALLOW_COPY_AND_ASSIGN(ExtensionService);
860 }; 855 };
861 856
862 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 857 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698