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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager.h

Issue 279703005: Remove debug in WallpaperManagerBrowserTest.DisplayChange. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // NULL). Returns true on success. 215 // NULL). Returns true on success.
216 static bool ResizeAndSaveWallpaper(const gfx::ImageSkia& image, 216 static bool ResizeAndSaveWallpaper(const gfx::ImageSkia& image,
217 const base::FilePath& path, 217 const base::FilePath& path,
218 ash::WallpaperLayout layout, 218 ash::WallpaperLayout layout,
219 int preferred_width, 219 int preferred_width,
220 int preferred_height, 220 int preferred_height,
221 gfx::ImageSkia* output_skia); 221 gfx::ImageSkia* output_skia);
222 222
223 // Returns the appropriate wallpaper resolution for all root windows. 223 // Returns the appropriate wallpaper resolution for all root windows.
224 static WallpaperResolution GetAppropriateResolution(); 224 static WallpaperResolution GetAppropriateResolution();
225 // This is a temporary variant of the previous method to investigate
226 // a problem with WallpaperManagetBrowserTest.
227 static WallpaperResolution GetAppropriateResolutionForTesting();
228 225
229 void SetCommandLineForTesting(base::CommandLine* command_line); 226 void SetCommandLineForTesting(base::CommandLine* command_line);
230 227
231 // Indicates imminent shutdown, allowing the WallpaperManager to remove any 228 // Indicates imminent shutdown, allowing the WallpaperManager to remove any
232 // observers it has registered. 229 // observers it has registered.
233 void Shutdown(); 230 void Shutdown();
234 231
235 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers. 232 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
236 void AddObservers(); 233 void AddObservers();
237 234
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 604
608 // Current decoded default image is stored in cache. 605 // Current decoded default image is stored in cache.
609 scoped_ptr<UserImage> default_wallpaper_image_; 606 scoped_ptr<UserImage> default_wallpaper_image_;
610 607
611 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); 608 DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
612 }; 609 };
613 610
614 } // namespace chromeos 611 } // namespace chromeos
615 612
616 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 613 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698