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

Unified Diff: chrome/browser/ui/webui/options2/media_galleries_handler.cc

Issue 10835016: Rename media gallery -> media galleries in pref/UI components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/ui/webui/options2/media_galleries_handler.cc
diff --git a/chrome/browser/ui/webui/options2/media_gallery_handler.cc b/chrome/browser/ui/webui/options2/media_galleries_handler.cc
similarity index 61%
rename from chrome/browser/ui/webui/options2/media_gallery_handler.cc
rename to chrome/browser/ui/webui/options2/media_galleries_handler.cc
index f0909ddaeab70d83d421dd500eb93dfea2b0b93a..9453b0d3865566c97c680d110552fd1e46f8884c 100644
--- a/chrome/browser/ui/webui/options2/media_gallery_handler.cc
+++ b/chrome/browser/ui/webui/options2/media_galleries_handler.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options2/media_gallery_handler.h"
+#include "chrome/browser/ui/webui/options2/media_galleries_handler.h"
#include "base/bind.h"
-#include "chrome/browser/media_gallery/media_gallery_registry.h"
-#include "chrome/browser/media_gallery/media_gallery_registry_factory.h"
+#include "chrome/browser/media_gallery/media_galleries_preferences.h"
+#include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/chrome_select_file_policy.h"
@@ -20,13 +20,13 @@
namespace options2 {
-MediaGalleryHandler::MediaGalleryHandler() {
+MediaGalleriesHandler::MediaGalleriesHandler() {
}
-MediaGalleryHandler::~MediaGalleryHandler() {
+MediaGalleriesHandler::~MediaGalleriesHandler() {
}
-void MediaGalleryHandler::GetLocalizedValues(DictionaryValue* values) {
+void MediaGalleriesHandler::GetLocalizedValues(DictionaryValue* values) {
DCHECK(values);
static OptionsStringResource resources[] = {
@@ -40,42 +40,42 @@ void MediaGalleryHandler::GetLocalizedValues(DictionaryValue* values) {
IDS_MEDIA_GALLERY_MANAGE_TITLE);
}
-void MediaGalleryHandler::InitializeHandler() {
- if (!MediaGalleryRegistry::UserInteractionIsEnabled())
+void MediaGalleriesHandler::InitializeHandler() {
+ if (!MediaGalleriesPreferences::UserInteractionIsEnabled())
return;
Profile* profile = Profile::FromWebUI(web_ui());
pref_change_registrar_.Init(profile->GetPrefs());
- pref_change_registrar_.Add(prefs::kMediaGalleryRememberedGalleries, this);
+ pref_change_registrar_.Add(prefs::kMediaGalleriesRememberedGalleries, this);
}
-void MediaGalleryHandler::InitializePage() {
- if (!MediaGalleryRegistry::UserInteractionIsEnabled())
+void MediaGalleriesHandler::InitializePage() {
+ if (!MediaGalleriesPreferences::UserInteractionIsEnabled())
return;
OnGalleriesChanged();
}
-void MediaGalleryHandler::RegisterMessages() {
+void MediaGalleriesHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
"addNewGallery",
- base::Bind(&MediaGalleryHandler::HandleAddNewGallery,
+ base::Bind(&MediaGalleriesHandler::HandleAddNewGallery,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"forgetGallery",
- base::Bind(&MediaGalleryHandler::HandleForgetGallery,
+ base::Bind(&MediaGalleriesHandler::HandleForgetGallery,
base::Unretained(this)));
}
-void MediaGalleryHandler::OnGalleriesChanged() {
+void MediaGalleriesHandler::OnGalleriesChanged() {
Profile* profile = Profile::FromWebUI(web_ui());
const ListValue* list = profile->GetPrefs()->GetList(
- prefs::kMediaGalleryRememberedGalleries);
+ prefs::kMediaGalleriesRememberedGalleries);
web_ui()->CallJavascriptFunction(
- "options.MediaGalleryManager.setAvailableMediaGalleries", *list);
+ "options.MediaGalleriesManager.setAvailableMediaGalleries", *list);
}
-void MediaGalleryHandler::HandleAddNewGallery(const base::ListValue* args) {
+void MediaGalleriesHandler::HandleAddNewGallery(const base::ListValue* args) {
SelectFileDialog* dialog = SelectFileDialog::Create(
this,
new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
@@ -89,29 +89,31 @@ void MediaGalleryHandler::HandleAddNewGallery(const base::ListValue* args) {
NULL);
}
-void MediaGalleryHandler::HandleForgetGallery(const base::ListValue* args) {
+void MediaGalleriesHandler::HandleForgetGallery(const base::ListValue* args) {
// TODO(estade): use uint64.
int id;
CHECK(ExtractIntegerValue(args, &id));
- MediaGalleryRegistry* registry =
- MediaGalleryRegistryFactory::GetForProfile(Profile::FromWebUI(web_ui()));
- registry->ForgetGalleryById(id);
+ MediaGalleriesPreferences* prefs =
+ MediaGalleriesPreferencesFactory::GetForProfile(
+ Profile::FromWebUI(web_ui()));
+ prefs->ForgetGalleryById(id);
}
-void MediaGalleryHandler::FileSelected(
+void MediaGalleriesHandler::FileSelected(
const FilePath& path, int index, void* params) {
- MediaGalleryRegistry* registry =
- MediaGalleryRegistryFactory::GetForProfile(Profile::FromWebUI(web_ui()));
- registry->AddGalleryByPath(path);
+ MediaGalleriesPreferences* prefs =
+ MediaGalleriesPreferencesFactory::GetForProfile(
+ Profile::FromWebUI(web_ui()));
+ prefs->AddGalleryByPath(path);
}
-void MediaGalleryHandler::Observe(
+void MediaGalleriesHandler::Observe(
int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
if (type == chrome::NOTIFICATION_PREF_CHANGED &&
*content::Details<std::string>(details).ptr() ==
- prefs::kMediaGalleryRememberedGalleries) {
+ prefs::kMediaGalleriesRememberedGalleries) {
OnGalleriesChanged();
} else {
NOTREACHED();
« no previous file with comments | « chrome/browser/ui/webui/options2/media_galleries_handler.h ('k') | chrome/browser/ui/webui/options2/media_gallery_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698