chrome/browser/media_gallery/media_galleries_dialog_controller.cc - Issue 11304022: [Media Gallery] Add existing attached devices to the prefs in time for media galleries 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/media_gallery/media_galleries_dialog_controller.cc

Issue 11304022: [Media Gallery] Add existing attached devices to the prefs in time for media galleries dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed review comments Created 8 years, 2 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/media_gallery/media_file_system_registry.cc ('k') | chrome/browser/media_gallery/media_galleries_preferences_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_gallery/media_galleries_dialog_controller.cc

diff --git a/chrome/browser/media_gallery/media_galleries_dialog_controller.cc b/chrome/browser/media_gallery/media_galleries_dialog_controller.cc

index da531279bac336a9d19c4215d3d29ce42289816f..0a3e2a91182091c7d36529042980a61ebb99d52b 100644

--- a/chrome/browser/media_gallery/media_galleries_dialog_controller.cc

+++ b/chrome/browser/media_gallery/media_galleries_dialog_controller.cc

@@ -6,7 +6,7 @@

#include "base/path_service.h"

#include "base/utf_string_conversions.h"

-#include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"

+#include "chrome/browser/media_gallery/media_file_system_registry.h"

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

#include "chrome/browser/ui/chrome_select_file_policy.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

@@ -28,7 +28,7 @@ MediaGalleriesDialogController::MediaGalleriesDialogController(

: web_contents_(web_contents),

extension_(&extension),

on_finish_(on_finish),

- preferences_(MediaGalleriesPreferencesFactory::GetForProfile(

+ preferences_(MediaFileSystemRegistry::GetInstance()->GetPreferences(

Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {

LookUpPermissions();