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

Unified Diff: chrome/browser/media_gallery/media_galleries_dialog_controller.h

Issue 10854150: Cocoa: Media gallery dialog unit test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/media_gallery/media_galleries_dialog_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_gallery/media_galleries_dialog_controller.h
diff --git a/chrome/browser/media_gallery/media_galleries_dialog_controller.h b/chrome/browser/media_gallery/media_galleries_dialog_controller.h
index ec50bd08ca3316434189469a76c7d39da9478c5a..741d5b73fec01447cddae6f0381fc8b6befe3204 100644
--- a/chrome/browser/media_gallery/media_galleries_dialog_controller.h
+++ b/chrome/browser/media_gallery/media_galleries_dialog_controller.h
@@ -66,22 +66,19 @@ class MediaGalleriesDialogController : public ui::SelectFileDialog::Listener {
const base::Callback<void(void)>& on_finish);
// Called by the view.
- string16 GetHeader() const;
- string16 GetSubtext() const;
- bool HasPermittedGalleries() const;
- void OnAddFolderClicked();
+ virtual string16 GetHeader() const;
+ virtual string16 GetSubtext() const;
+ virtual bool HasPermittedGalleries() const;
+ virtual void OnAddFolderClicked();
virtual void DidToggleGallery(const MediaGalleryPrefInfo* pref_info,
bool enabled);
virtual void DialogFinished(bool accepted);
+ virtual const KnownGalleryPermissions& permissions() const;
// SelectFileDialog::Listener implementation:
virtual void FileSelected(const FilePath& path,
int index,
void* params) OVERRIDE;
- const KnownGalleryPermissions& permissions() const {
- return known_galleries_;
- }
-
TabContents* tab_contents() const {
return tab_contents_;
}
@@ -92,10 +89,6 @@ class MediaGalleriesDialogController : public ui::SelectFileDialog::Listener {
virtual ~MediaGalleriesDialogController();
- // This map excludes those galleries which have been blacklisted; it only
- // counts active known galleries.
- KnownGalleryPermissions known_galleries_;
-
private:
// This type is for media galleries that have been added via "add gallery"
// button, but have not yet been committed to the prefs system and will be
@@ -116,6 +109,9 @@ class MediaGalleriesDialogController : public ui::SelectFileDialog::Listener {
// while the dialog is showing. Will be NULL only during tests.
const extensions::Extension* extension_;
+ // This map excludes those galleries which have been blacklisted; it only
+ // counts active known galleries.
+ KnownGalleryPermissions known_galleries_;
NewGalleryPermissions new_galleries_;
// We run this callback when done.
« no previous file with comments | « no previous file | chrome/browser/media_gallery/media_galleries_dialog_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698