Index: chrome/browser/media_gallery/media_galleries_dialog_controller.cc |
diff --git a/chrome/browser/media_gallery/media_galleries_dialog_controller.cc b/chrome/browser/media_gallery/media_galleries_dialog_controller.cc |
index f259ca14a192a8667ba0fdff85bbe8e3e87e0232..5f83c1673bc4d516250eaf38b3ead342e9a53b65 100644 |
--- a/chrome/browser/media_gallery/media_galleries_dialog_controller.cc |
+++ b/chrome/browser/media_gallery/media_galleries_dialog_controller.cc |
@@ -44,13 +44,13 @@ MediaGalleriesDialogController::~MediaGalleriesDialogController() { |
select_folder_dialog_->ListenerDestroyed(); |
} |
-string16 MediaGalleriesDialogController::GetHeader() { |
+string16 MediaGalleriesDialogController::GetHeader() const { |
std::string extension_name(extension_ ? extension_->name() : ""); |
return l10n_util::GetStringFUTF16(IDS_MEDIA_GALLERIES_DIALOG_HEADER, |
UTF8ToUTF16(extension_name)); |
} |
-string16 MediaGalleriesDialogController::GetSubtext() { |
+string16 MediaGalleriesDialogController::GetSubtext() const { |
if (extension_ && extension_->HasAPIPermission( |
extensions::APIPermission::kMediaGalleriesRead)) { |
return l10n_util::GetStringFUTF16(IDS_MEDIA_GALLERIES_DIALOG_READ_SUBTEXT, |
@@ -60,6 +60,15 @@ string16 MediaGalleriesDialogController::GetSubtext() { |
return string16(); |
} |
+bool MediaGalleriesDialogController::HasPermittedGalleries() const { |
+ for (KnownGalleryPermissions::const_iterator iter = permissions().begin(); |
+ iter != permissions().end(); iter++) { |
+ if (iter->second.allowed) |
+ return true; |
+ } |
+ return false; |
+} |
+ |
void MediaGalleriesDialogController::OnAddFolderClicked() { |
FilePath user_data_dir; |
PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); |
@@ -75,7 +84,7 @@ void MediaGalleriesDialogController::OnAddFolderClicked() { |
NULL); |
} |
-void MediaGalleriesDialogController::GalleryToggled( |
+void MediaGalleriesDialogController::DidToggleGallery( |
const MediaGalleryPrefInfo* gallery, |
bool enabled) { |
// Check known galleries. |