chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 318733003: Use the media galleries controller interface for the scan result dialog.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

Issue 318733003: Use the media galleries controller interface for the scan result dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/media_galleries/media_galleries_api.h ('k') | chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc » ('j') | chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

index d75bba1e8f6ed550eade4a4cffcdc8b0a2ef4175..6f3c1a778d1b1b9c217dcfd86e5424147086261a 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -28,7 +28,7 @@

#include "chrome/browser/media_galleries/media_galleries_histograms.h"

#include "chrome/browser/media_galleries/media_galleries_permission_controller.h"

#include "chrome/browser/media_galleries/media_galleries_preferences.h"

-#include "chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h"

+#include "chrome/browser/media_galleries/media_galleries_scan_result_controller.h"

#include "chrome/browser/media_galleries/media_scan_manager.h"

#include "chrome/browser/platform_util.h"

#include "chrome/browser/profiles/profile.h"

@@ -761,14 +761,14 @@ bool MediaGalleriesAddScanResultsFunction::RunAsync() {

&MediaGalleriesAddScanResultsFunction::OnPreferencesInit, this));

}

-MediaGalleriesScanResultDialogController*

+MediaGalleriesScanResultController*

MediaGalleriesAddScanResultsFunction::MakeDialog(

content::WebContents* web_contents,

const extensions::Extension& extension,

const base::Closure& on_finish) {

// Controller will delete itself.

- return new MediaGalleriesScanResultDialogController(web_contents, extension,

- on_finish);

+ return new MediaGalleriesScanResultController(web_contents, extension,

+ on_finish);

}

void MediaGalleriesAddScanResultsFunction::OnPreferencesInit() {

@@ -776,7 +776,7 @@ void MediaGalleriesAddScanResultsFunction::OnPreferencesInit() {

const Extension* extension = GetExtension();

MediaGalleriesPreferences* preferences =

media_file_system_registry()->GetPreferences(GetProfile());

- if (MediaGalleriesScanResultDialogController::ScanResultCountForExtension(

+ if (MediaGalleriesScanResultController::ScanResultCountForExtension(

preferences, extension) == 0) {

GetAndReturnGalleries();

return;