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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc

Issue 10698053: Breaks compile on Linux Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
Index: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc (revision 144942)
+++ chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc (working copy)
@@ -17,7 +17,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"
#include "chrome/browser/ui/webui/web_ui_util.h"
#include "chrome/common/chrome_paths.h"
@@ -177,8 +176,8 @@
void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) {
DCHECK(args && args->empty());
- select_file_dialog_ = SelectFileDialog::Create(
- this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
+ if (!select_file_dialog_.get())
+ select_file_dialog_ = SelectFileDialog::Create(this);
FilePath downloads_path;
if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path))
@@ -192,6 +191,7 @@
l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE),
downloads_path, &file_type_info, 0,
FILE_PATH_LITERAL(""),
+ web_ui()->GetWebContents(),
GetBrowserWindow(), NULL);
}

Powered by Google App Engine
This is Rietveld 408576698