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

Side by Side Diff: chrome/browser/ui/webui/options/media_galleries_handler.cc

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 7 years, 3 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 #include "chrome/browser/ui/webui/options/media_galleries_handler.h" 5 #include "chrome/browser/ui/webui/options/media_galleries_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/media_galleries/media_file_system_registry.h" 12 #include "chrome/browser/media_galleries/media_file_system_registry.h"
13 #include "chrome/browser/media_galleries/media_galleries_preferences.h" 13 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/storage_monitor/storage_monitor.h" 15 #include "chrome/browser/storage_monitor/storage_monitor.h"
16 #include "chrome/browser/ui/chrome_select_file_policy.h" 16 #include "chrome/browser/ui/chrome_select_file_policy.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "content/public/browser/notification_details.h" 18 #include "content/public/browser/notification_details.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_contents_view.h" 20 #include "content/public/browser/web_contents_view.h"
21 #include "content/public/browser/web_ui.h" 21 #include "content/public/browser/web_ui.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 23
24 namespace options { 24 namespace options {
25 25
26 using chrome::MediaGalleriesPreferences;
27 using chrome::MediaGalleriesPrefInfoMap;
28 using chrome::MediaGalleryPrefInfo;
29
30 MediaGalleriesHandler::MediaGalleriesHandler() 26 MediaGalleriesHandler::MediaGalleriesHandler()
31 : weak_ptr_factory_(this) { 27 : weak_ptr_factory_(this) {
32 } 28 }
33 29
34 MediaGalleriesHandler::~MediaGalleriesHandler() { 30 MediaGalleriesHandler::~MediaGalleriesHandler() {
35 if (select_file_dialog_.get()) 31 if (select_file_dialog_.get())
36 select_file_dialog_->ListenerDestroyed(); 32 select_file_dialog_->ListenerDestroyed();
37 } 33 }
38 34
39 void MediaGalleriesHandler::GetLocalizedValues(DictionaryValue* values) { 35 void MediaGalleriesHandler::GetLocalizedValues(DictionaryValue* values) {
40 DCHECK(values); 36 DCHECK(values);
41 37
42 static OptionsStringResource resources[] = { 38 static OptionsStringResource resources[] = {
43 { "mediaGalleriesSectionLabel", IDS_MEDIA_GALLERY_SECTION_LABEL }, 39 { "mediaGalleriesSectionLabel", IDS_MEDIA_GALLERY_SECTION_LABEL },
44 { "manageGalleriesButton", IDS_MEDIA_GALLERY_MANAGE_BUTTON }, 40 { "manageGalleriesButton", IDS_MEDIA_GALLERY_MANAGE_BUTTON },
45 { "addNewGalleryButton", IDS_MEDIA_GALLERY_ADD_NEW_BUTTON }, 41 { "addNewGalleryButton", IDS_MEDIA_GALLERY_ADD_NEW_BUTTON },
46 }; 42 };
47 43
48 RegisterStrings(values, resources, arraysize(resources)); 44 RegisterStrings(values, resources, arraysize(resources));
49 RegisterTitle(values, "manageMediaGalleries", 45 RegisterTitle(values, "manageMediaGalleries",
50 IDS_MEDIA_GALLERY_MANAGE_TITLE); 46 IDS_MEDIA_GALLERY_MANAGE_TITLE);
51 } 47 }
52 48
53 void MediaGalleriesHandler::InitializePage() { 49 void MediaGalleriesHandler::InitializePage() {
54 chrome::StorageMonitor::GetInstance()->EnsureInitialized( 50 StorageMonitor::GetInstance()->EnsureInitialized(
55 base::Bind(&MediaGalleriesHandler::InitializeOnStorageMonitorInit, 51 base::Bind(&MediaGalleriesHandler::InitializeOnStorageMonitorInit,
56 weak_ptr_factory_.GetWeakPtr())); 52 weak_ptr_factory_.GetWeakPtr()));
57 } 53 }
58 54
59 void MediaGalleriesHandler::InitializeOnStorageMonitorInit() { 55 void MediaGalleriesHandler::InitializeOnStorageMonitorInit() {
60 Profile* profile = Profile::FromWebUI(web_ui()); 56 Profile* profile = Profile::FromWebUI(web_ui());
61 if (!chrome::MediaGalleriesPreferences::APIHasBeenUsed(profile)) 57 if (!MediaGalleriesPreferences::APIHasBeenUsed(profile))
62 return; 58 return;
63 59
64 if (pref_change_registrar_.IsEmpty()) { 60 if (pref_change_registrar_.IsEmpty()) {
65 pref_change_registrar_.Init(profile->GetPrefs()); 61 pref_change_registrar_.Init(profile->GetPrefs());
66 pref_change_registrar_.Add( 62 pref_change_registrar_.Add(
67 prefs::kMediaGalleriesRememberedGalleries, 63 prefs::kMediaGalleriesRememberedGalleries,
68 base::Bind(&MediaGalleriesHandler::OnGalleriesChanged, 64 base::Bind(&MediaGalleriesHandler::OnGalleriesChanged,
69 base::Unretained(this))); 65 base::Unretained(this)));
70 } 66 }
71 67
72 OnGalleriesChanged(); 68 OnGalleriesChanged();
73 } 69 }
74 70
75 void MediaGalleriesHandler::RegisterMessages() { 71 void MediaGalleriesHandler::RegisterMessages() {
76 chrome::StorageMonitor::GetInstance()->EnsureInitialized( 72 StorageMonitor::GetInstance()->EnsureInitialized(
77 base::Bind(&MediaGalleriesHandler::RegisterOnStorageMonitorInit, 73 base::Bind(&MediaGalleriesHandler::RegisterOnStorageMonitorInit,
78 weak_ptr_factory_.GetWeakPtr())); 74 weak_ptr_factory_.GetWeakPtr()));
79 } 75 }
80 76
81 void MediaGalleriesHandler::RegisterOnStorageMonitorInit() { 77 void MediaGalleriesHandler::RegisterOnStorageMonitorInit() {
82 web_ui()->RegisterMessageCallback( 78 web_ui()->RegisterMessageCallback(
83 "addNewGallery", 79 "addNewGallery",
84 base::Bind(&MediaGalleriesHandler::HandleAddNewGallery, 80 base::Bind(&MediaGalleriesHandler::HandleAddNewGallery,
85 base::Unretained(this))); 81 base::Unretained(this)));
86 web_ui()->RegisterMessageCallback( 82 web_ui()->RegisterMessageCallback(
87 "forgetGallery", 83 "forgetGallery",
88 base::Bind(&MediaGalleriesHandler::HandleForgetGallery, 84 base::Bind(&MediaGalleriesHandler::HandleForgetGallery,
89 base::Unretained(this))); 85 base::Unretained(this)));
90 } 86 }
91 87
92 void MediaGalleriesHandler::OnGalleriesChanged() { 88 void MediaGalleriesHandler::OnGalleriesChanged() {
93 DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized()); 89 DCHECK(StorageMonitor::GetInstance()->IsInitialized());
94 Profile* profile = Profile::FromWebUI(web_ui()); 90 Profile* profile = Profile::FromWebUI(web_ui());
95 chrome::MediaGalleriesPreferences* preferences = 91 MediaGalleriesPreferences* preferences =
96 g_browser_process->media_file_system_registry()->GetPreferences(profile); 92 g_browser_process->media_file_system_registry()->GetPreferences(profile);
97 93
98 ListValue list; 94 ListValue list;
99 const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries(); 95 const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
100 for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin(); 96 for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
101 iter != galleries.end(); ++iter) { 97 iter != galleries.end(); ++iter) {
102 const MediaGalleryPrefInfo& gallery = iter->second; 98 const MediaGalleryPrefInfo& gallery = iter->second;
103 if (gallery.type == MediaGalleryPrefInfo::kBlackListed) 99 if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
104 continue; 100 continue;
105 101
(...skipping 25 matching lines...) Expand all
131 127
132 void MediaGalleriesHandler::HandleForgetGallery(const base::ListValue* args) { 128 void MediaGalleriesHandler::HandleForgetGallery(const base::ListValue* args) {
133 std::string string_id; 129 std::string string_id;
134 uint64 id = 0; 130 uint64 id = 0;
135 if (!args->GetString(0, &string_id) || 131 if (!args->GetString(0, &string_id) ||
136 !base::StringToUint64(string_id, &id)) { 132 !base::StringToUint64(string_id, &id)) {
137 NOTREACHED(); 133 NOTREACHED();
138 return; 134 return;
139 } 135 }
140 136
141 DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized()); 137 DCHECK(StorageMonitor::GetInstance()->IsInitialized());
142 chrome::MediaGalleriesPreferences* preferences = 138 MediaGalleriesPreferences* preferences =
143 g_browser_process->media_file_system_registry()->GetPreferences( 139 g_browser_process->media_file_system_registry()->GetPreferences(
144 Profile::FromWebUI(web_ui())); 140 Profile::FromWebUI(web_ui()));
145 preferences->ForgetGalleryById(id); 141 preferences->ForgetGalleryById(id);
146 } 142 }
147 143
148 void MediaGalleriesHandler::FileSelected(const base::FilePath& path, 144 void MediaGalleriesHandler::FileSelected(const base::FilePath& path,
149 int index, 145 int index,
150 void* params) { 146 void* params) {
151 DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized()); 147 DCHECK(StorageMonitor::GetInstance()->IsInitialized());
152 chrome::MediaGalleriesPreferences* preferences = 148 MediaGalleriesPreferences* preferences =
153 g_browser_process->media_file_system_registry()->GetPreferences( 149 g_browser_process->media_file_system_registry()->GetPreferences(
154 Profile::FromWebUI(web_ui())); 150 Profile::FromWebUI(web_ui()));
155 preferences->AddGalleryByPath(path); 151 preferences->AddGalleryByPath(path);
156 } 152 }
157 153
158 } // namespace options 154 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698