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

Side by Side Diff: chrome/browser/media_galleries/media_galleries_preferences.cc

Issue 15742010: Use MediaGalleryPreferences directly in GalleryWatchStateTracker interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make sure to get all call sites Created 7 years, 6 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
« no previous file with comments | « chrome/browser/media_galleries/media_galleries_preferences.h ('k') | no next file » | 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/media_galleries/media_galleries_preferences.h" 5 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 #endif 649 #endif
650 bool all_permission = HasAutoDetectedGalleryPermission(extension); 650 bool all_permission = HasAutoDetectedGalleryPermission(extension);
651 if (has_permission && all_permission) { 651 if (has_permission && all_permission) {
652 if (gallery_info->second.type == MediaGalleryPrefInfo::kAutoDetected) { 652 if (gallery_info->second.type == MediaGalleryPrefInfo::kAutoDetected) {
653 extensions::MediaGalleriesPrivateAPI::UnsetMediaGalleryPermission( 653 extensions::MediaGalleriesPrivateAPI::UnsetMediaGalleryPermission(
654 GetExtensionPrefs(), extension.id(), pref_id); 654 GetExtensionPrefs(), extension.id(), pref_id);
655 NotifyChangeObservers(extension.id()); 655 NotifyChangeObservers(extension.id());
656 #if defined(ENABLE_EXTENSIONS) 656 #if defined(ENABLE_EXTENSIONS)
657 if (state_tracker) { 657 if (state_tracker) {
658 state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id, 658 state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,
659 true); 659 true, this);
660 } 660 }
661 #endif 661 #endif
662 return; 662 return;
663 } 663 }
664 } 664 }
665 665
666 if (!has_permission && !all_permission) { 666 if (!has_permission && !all_permission) {
667 extensions::MediaGalleriesPrivateAPI::UnsetMediaGalleryPermission( 667 extensions::MediaGalleriesPrivateAPI::UnsetMediaGalleryPermission(
668 GetExtensionPrefs(), extension.id(), pref_id); 668 GetExtensionPrefs(), extension.id(), pref_id);
669 } else { 669 } else {
670 extensions::MediaGalleriesPrivateAPI::SetMediaGalleryPermission( 670 extensions::MediaGalleriesPrivateAPI::SetMediaGalleryPermission(
671 GetExtensionPrefs(), extension.id(), pref_id, has_permission); 671 GetExtensionPrefs(), extension.id(), pref_id, has_permission);
672 } 672 }
673 NotifyChangeObservers(extension.id()); 673 NotifyChangeObservers(extension.id());
674 #if defined(ENABLE_EXTENSIONS) 674 #if defined(ENABLE_EXTENSIONS)
675 if (state_tracker) { 675 if (state_tracker) {
676 state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id, 676 state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,
677 has_permission); 677 has_permission, this);
678 } 678 }
679 #endif 679 #endif
680 } 680 }
681 681
682 void MediaGalleriesPreferences::Shutdown() { 682 void MediaGalleriesPreferences::Shutdown() {
683 weak_factory_.InvalidateWeakPtrs(); 683 weak_factory_.InvalidateWeakPtrs();
684 profile_ = NULL; 684 profile_ = NULL;
685 } 685 }
686 686
687 // static 687 // static
(...skipping 15 matching lines...) Expand all
703 } 703 }
704 704
705 extensions::ExtensionPrefs* 705 extensions::ExtensionPrefs*
706 MediaGalleriesPreferences::GetExtensionPrefs() const { 706 MediaGalleriesPreferences::GetExtensionPrefs() const {
707 ExtensionService* extension_service = 707 ExtensionService* extension_service =
708 extensions::ExtensionSystem::Get(profile_)->extension_service(); 708 extensions::ExtensionSystem::Get(profile_)->extension_service();
709 return extension_service->extension_prefs(); 709 return extension_service->extension_prefs();
710 } 710 }
711 711
712 } // namespace chrome 712 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/media_galleries_preferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698