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

Unified Diff: chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc

Issue 148093011: Abstract media galleries context menu code and use it in scan result dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Header too Created 6 years, 11 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/media_galleries/media_galleries_scan_result_dialog_controller.cc
diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc
index befcd8abf727325dd13101189d9bded6f6997f22..d038f19b5fe2676be12f756143e22e612e2397cd 100644
--- a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc
+++ b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/media_galleries/media_file_system_registry.h"
#include "chrome/browser/media_galleries/media_galleries_histograms.h"
+#include "chrome/browser/media_galleries/media_gallery_context_menu.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/storage_monitor/storage_info.h"
@@ -65,6 +66,11 @@ MediaGalleriesScanResultDialogController(
preferences_->EnsureInitialized(base::Bind(
&MediaGalleriesScanResultDialogController::OnPreferencesInitialized,
base::Unretained(this)));
+
+ // Unretained is safe because |this| owns |context_menu_|.
+ context_menu_.reset(new MediaGalleryContextMenu(base::Bind(
+ &MediaGalleriesScanResultDialogController::DidForgetGallery,
+ base::Unretained(this))));
}
MediaGalleriesScanResultDialogController::
@@ -187,6 +193,12 @@ content::WebContents* MediaGalleriesScanResultDialogController::web_contents() {
return web_contents_;
}
+ui::MenuModel* MediaGalleriesScanResultDialogController::GetContextMenu(
+ MediaGalleryPrefId id) {
+ context_menu_->set_pref_id(id);
+ return context_menu_.get();
+}
+
void MediaGalleriesScanResultDialogController::OnPreferencesInitialized() {
preferences_->AddGalleryChangeObserver(this);
StorageMonitor::GetInstance()->AddObserver(this);

Powered by Google App Engine
This is Rietveld 408576698