chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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_apitest.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.cc ('k') | chrome/browser/media_galleries/media_galleries_dialog_controller.h » ('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_apitest.cc

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

index d2e6f1183bc61fc7659e67aa8cc007989479363d..9fd1a3ca42ebe2a1c38f7432792af21d5fb24451 100644

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

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

@@ -18,7 +18,7 @@

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

#include "chrome/browser/media_galleries/media_folder_finder.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_galleries_test_util.h"

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

#include "chrome/common/chrome_paths.h"

@@ -95,11 +95,11 @@ class TestMediaGalleriesAddScanResultsFunction

virtual ~TestMediaGalleriesAddScanResultsFunction() {}

// Accepts the dialog as soon as it is created.

- virtual MediaGalleriesScanResultDialogController* MakeDialog(

+ virtual MediaGalleriesScanResultController* MakeDialog(

content::WebContents* web_contents,

const extensions::Extension& extension,

const base::Closure& on_finish) OVERRIDE {

- MediaGalleriesScanResultDialogController* controller =

+ MediaGalleriesScanResultController* controller =

extensions::MediaGalleriesAddScanResultsFunction::MakeDialog(

web_contents, extension, on_finish);

controller->dialog_->AcceptDialogForTesting();