summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api
diff options
context:
space:
mode:
authortommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 21:42:55 +0000
committertommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 21:42:55 +0000
commitc138296a8ff077a3aba17588abd18fed9bd7fba2 (patch)
tree92af52e76ca3fc03ea64ae95513b2ec6a8db62a4 /chrome/browser/extensions/api
parent2cdd2a0ffdc7a530e2d5ca8fb00e202cf4796ab5 (diff)
downloadchromium_src-c138296a8ff077a3aba17588abd18fed9bd7fba2.zip
chromium_src-c138296a8ff077a3aba17588abd18fed9bd7fba2.tar.gz
chromium_src-c138296a8ff077a3aba17588abd18fed9bd7fba2.tar.bz2
Media Galleries API Scanning: Give cached scan results if no user gesture.
BUG=161119 Review URL: https://codereview.chromium.org/141203004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
-rw-r--r--chrome/browser/extensions/api/media_galleries/media_galleries_api.cc4
1 files changed, 2 insertions, 2 deletions
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 bc56c96..73ea1c9 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -657,7 +657,7 @@ void MediaGalleriesStartMediaScanFunction::OnPreferencesInit() {
return;
}
- media_scan_manager()->StartScan(GetProfile(), GetExtension()->id());
+ media_scan_manager()->StartScan(GetProfile(), GetExtension(), user_gesture());
SendResponse(true);
}
@@ -678,7 +678,7 @@ bool MediaGalleriesCancelMediaScanFunction::RunImpl() {
void MediaGalleriesCancelMediaScanFunction::OnPreferencesInit() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- media_scan_manager()->CancelScan(GetProfile(), GetExtension()->id());
+ media_scan_manager()->CancelScan(GetProfile(), GetExtension());
SendResponse(true);
}