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_handler.cc

Issue 10824146: Remove "All files" filter from the wallpaper image picker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 r.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r.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"
(...skipping 26 matching lines...) Expand all
37 file_type_info.extensions.resize(1); 37 file_type_info.extensions.resize(1);
38 38
39 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg")); 39 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));
40 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg")); 40 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg"));
41 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png")); 41 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png"));
42 42
43 file_type_info.extension_description_overrides.resize(1); 43 file_type_info.extension_description_overrides.resize(1);
44 file_type_info.extension_description_overrides[0] = 44 file_type_info.extension_description_overrides[0] =
45 l10n_util::GetStringUTF16(IDS_IMAGE_FILES); 45 l10n_util::GetStringUTF16(IDS_IMAGE_FILES);
46 46
47 file_type_info.include_all_files = true;
48
49 return file_type_info; 47 return file_type_info;
50 } 48 }
51 49
52 } // namespace 50 } // namespace
53 51
54 SetWallpaperOptionsHandler::SetWallpaperOptionsHandler() 52 SetWallpaperOptionsHandler::SetWallpaperOptionsHandler()
55 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { 53 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
56 } 54 }
57 55
58 SetWallpaperOptionsHandler::~SetWallpaperOptionsHandler() { 56 SetWallpaperOptionsHandler::~SetWallpaperOptionsHandler() {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 251 }
254 252
255 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const { 253 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
256 Browser* browser = 254 Browser* browser =
257 browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); 255 browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
258 return browser->window()->GetNativeWindow(); 256 return browser->window()->GetNativeWindow();
259 } 257 }
260 258
261 } // namespace options2 259 } // namespace options2
262 } // namespace chromeos 260 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698