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

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

Issue 16472007: Rename StorageMonitor Initialize function to EnsureInitialized for better understanding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comments 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
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_unittest.cc ('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/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"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 { "manageGalleriesButton", IDS_MEDIA_GALLERY_MANAGE_BUTTON }, 46 { "manageGalleriesButton", IDS_MEDIA_GALLERY_MANAGE_BUTTON },
47 { "addNewGalleryButton", IDS_MEDIA_GALLERY_ADD_NEW_BUTTON }, 47 { "addNewGalleryButton", IDS_MEDIA_GALLERY_ADD_NEW_BUTTON },
48 }; 48 };
49 49
50 RegisterStrings(values, resources, arraysize(resources)); 50 RegisterStrings(values, resources, arraysize(resources));
51 RegisterTitle(values, "manageMediaGalleries", 51 RegisterTitle(values, "manageMediaGalleries",
52 IDS_MEDIA_GALLERY_MANAGE_TITLE); 52 IDS_MEDIA_GALLERY_MANAGE_TITLE);
53 } 53 }
54 54
55 void MediaGalleriesHandler::InitializePage() { 55 void MediaGalleriesHandler::InitializePage() {
56 chrome::StorageMonitor::GetInstance()->Initialize( 56 chrome::StorageMonitor::GetInstance()->EnsureInitialized(
57 base::Bind(&MediaGalleriesHandler::InitializeOnStorageMonitorInit, 57 base::Bind(&MediaGalleriesHandler::InitializeOnStorageMonitorInit,
58 weak_ptr_factory_.GetWeakPtr())); 58 weak_ptr_factory_.GetWeakPtr()));
59 } 59 }
60 60
61 void MediaGalleriesHandler::InitializeOnStorageMonitorInit() { 61 void MediaGalleriesHandler::InitializeOnStorageMonitorInit() {
62 Profile* profile = Profile::FromWebUI(web_ui()); 62 Profile* profile = Profile::FromWebUI(web_ui());
63 if (!chrome::MediaGalleriesPreferences::APIHasBeenUsed(profile)) 63 if (!chrome::MediaGalleriesPreferences::APIHasBeenUsed(profile))
64 return; 64 return;
65 65
66 if (pref_change_registrar_.IsEmpty()) { 66 if (pref_change_registrar_.IsEmpty()) {
67 pref_change_registrar_.Init(profile->GetPrefs()); 67 pref_change_registrar_.Init(profile->GetPrefs());
68 pref_change_registrar_.Add( 68 pref_change_registrar_.Add(
69 prefs::kMediaGalleriesRememberedGalleries, 69 prefs::kMediaGalleriesRememberedGalleries,
70 base::Bind(&MediaGalleriesHandler::OnGalleriesChanged, 70 base::Bind(&MediaGalleriesHandler::OnGalleriesChanged,
71 base::Unretained(this))); 71 base::Unretained(this)));
72 } 72 }
73 73
74 OnGalleriesChanged(); 74 OnGalleriesChanged();
75 } 75 }
76 76
77 void MediaGalleriesHandler::RegisterMessages() { 77 void MediaGalleriesHandler::RegisterMessages() {
78 chrome::StorageMonitor::GetInstance()->Initialize( 78 chrome::StorageMonitor::GetInstance()->EnsureInitialized(
79 base::Bind(&MediaGalleriesHandler::RegisterOnStorageMonitorInit, 79 base::Bind(&MediaGalleriesHandler::RegisterOnStorageMonitorInit,
80 weak_ptr_factory_.GetWeakPtr())); 80 weak_ptr_factory_.GetWeakPtr()));
81 } 81 }
82 82
83 void MediaGalleriesHandler::RegisterOnStorageMonitorInit() { 83 void MediaGalleriesHandler::RegisterOnStorageMonitorInit() {
84 web_ui()->RegisterMessageCallback( 84 web_ui()->RegisterMessageCallback(
85 "addNewGallery", 85 "addNewGallery",
86 base::Bind(&MediaGalleriesHandler::HandleAddNewGallery, 86 base::Bind(&MediaGalleriesHandler::HandleAddNewGallery,
87 base::Unretained(this))); 87 base::Unretained(this)));
88 web_ui()->RegisterMessageCallback( 88 web_ui()->RegisterMessageCallback(
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 int index, 153 int index,
154 void* params) { 154 void* params) {
155 DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized()); 155 DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
156 chrome::MediaGalleriesPreferences* preferences = 156 chrome::MediaGalleriesPreferences* preferences =
157 g_browser_process->media_file_system_registry()->GetPreferences( 157 g_browser_process->media_file_system_registry()->GetPreferences(
158 Profile::FromWebUI(web_ui())); 158 Profile::FromWebUI(web_ui()));
159 preferences->AddGalleryByPath(path); 159 preferences->AddGalleryByPath(path);
160 } 160 }
161 161
162 } // namespace options 162 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698