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

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

Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r2.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r2.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/user_manager.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser_finder.h" 18 #include "chrome/browser/ui/browser_finder.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/chrome_select_file_policy.h"
20 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2. h" 21 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2. h"
21 #include "chrome/browser/ui/webui/web_ui_util.h" 22 #include "chrome/browser/ui/webui/web_ui_util.h"
22 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
23 #include "content/public/browser/web_ui.h" 24 #include "content/public/browser/web_ui.h"
24 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
28 29
29 namespace chromeos { 30 namespace chromeos {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setCustomImage"); 169 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setCustomImage");
169 } else { 170 } else {
170 SendLayoutOptions(ash::CENTER_CROPPED); 171 SendLayoutOptions(ash::CENTER_CROPPED);
171 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage", 172 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage",
172 image_url, is_random); 173 image_url, is_random);
173 } 174 }
174 } 175 }
175 176
176 void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) { 177 void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) {
177 DCHECK(args && args->empty()); 178 DCHECK(args && args->empty());
178 if (!select_file_dialog_.get()) 179 select_file_dialog_ = SelectFileDialog::Create(
179 select_file_dialog_ = SelectFileDialog::Create(this); 180 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
180 181
181 FilePath downloads_path; 182 FilePath downloads_path;
182 if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path)) 183 if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path))
183 NOTREACHED(); 184 NOTREACHED();
184 185
185 // Static so we initialize it only once. 186 // Static so we initialize it only once.
186 CR_DEFINE_STATIC_LOCAL(SelectFileDialog::FileTypeInfo, file_type_info, 187 CR_DEFINE_STATIC_LOCAL(SelectFileDialog::FileTypeInfo, file_type_info,
187 (GetUserImageFileTypeInfo())); 188 (GetUserImageFileTypeInfo()));
188 189
189 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE, 190 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
190 l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE), 191 l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE),
191 downloads_path, &file_type_info, 0, 192 downloads_path, &file_type_info, 0,
192 FILE_PATH_LITERAL(""), 193 FILE_PATH_LITERAL(""),
193 web_ui()->GetWebContents(),
194 GetBrowserWindow(), NULL); 194 GetBrowserWindow(), NULL);
195 } 195 }
196 196
197 void SetWallpaperOptionsHandler::HandleLayoutChanged(const ListValue* args) { 197 void SetWallpaperOptionsHandler::HandleLayoutChanged(const ListValue* args) {
198 int selected_layout = ash::CENTER_CROPPED; 198 int selected_layout = ash::CENTER_CROPPED;
199 if (!ExtractIntegerValue(args, &selected_layout)) 199 if (!ExtractIntegerValue(args, &selected_layout))
200 NOTREACHED() << "Could not read wallpaper layout from JSON argument"; 200 NOTREACHED() << "Could not read wallpaper layout from JSON argument";
201 201
202 ash::WallpaperLayout layout = 202 ash::WallpaperLayout layout =
203 static_cast<ash::WallpaperLayout>(selected_layout); 203 static_cast<ash::WallpaperLayout>(selected_layout);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const { 237 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
238 Browser* browser = 238 Browser* browser =
239 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui())); 239 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
240 if (!browser) 240 if (!browser)
241 return NULL; 241 return NULL;
242 return browser->window()->GetNativeWindow(); 242 return browser->window()->GetNativeWindow();
243 } 243 }
244 244
245 } // namespace options2 245 } // namespace options2
246 } // namespace chromeos 246 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698