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

Unified Diff: chrome/browser/media_gallery/media_galleries_dialog_controller.cc

Issue 11138010: Remove TabContents from media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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 7a8f6f712394e2dd2b9baeb47d2b85b38d718506..da531279bac336a9d19c4215d3d29ce42289816f 100644
--- a/chrome/browser/media_gallery/media_galleries_dialog_controller.cc
+++ b/chrome/browser/media_gallery/media_galleries_dialog_controller.cc
@@ -7,6 +7,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/profiles/profile.h"
#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_paths.h"
@@ -21,21 +22,21 @@ using extensions::Extension;
namespace chrome {
MediaGalleriesDialogController::MediaGalleriesDialogController(
- TabContents* tab_contents,
+ content::WebContents* web_contents,
const Extension& extension,
const base::Closure& on_finish)
- : tab_contents_(tab_contents),
+ : web_contents_(web_contents),
extension_(&extension),
on_finish_(on_finish),
preferences_(MediaGalleriesPreferencesFactory::GetForProfile(
- tab_contents_->profile())) {
+ Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {
LookUpPermissions();
dialog_.reset(MediaGalleriesDialog::Create(this));
}
MediaGalleriesDialogController::MediaGalleriesDialogController()
- : tab_contents_(NULL),
+ : web_contents_(NULL),
extension_(NULL),
preferences_(NULL) {}
@@ -75,7 +76,7 @@ void MediaGalleriesDialogController::OnAddFolderClicked() {
l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY_TITLE),
user_data_dir,
NULL, 0, FILE_PATH_LITERAL(""),
- tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow(),
+ web_contents_->GetView()->GetTopLevelNativeWindow(),
NULL);
}

Powered by Google App Engine
This is Rietveld 408576698