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

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

Issue 239703014: Add debug to WallpaperManagerBrowserTest.DisplayChange test. (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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // NULL). Returns true on success. 214 // NULL). Returns true on success.
215 static bool ResizeAndSaveWallpaper(const gfx::ImageSkia& image, 215 static bool ResizeAndSaveWallpaper(const gfx::ImageSkia& image,
216 const base::FilePath& path, 216 const base::FilePath& path,
217 ash::WallpaperLayout layout, 217 ash::WallpaperLayout layout,
218 int preferred_width, 218 int preferred_width,
219 int preferred_height, 219 int preferred_height,
220 gfx::ImageSkia* output_skia); 220 gfx::ImageSkia* output_skia);
221 221
222 // Returns the appropriate wallpaper resolution for all root windows. 222 // Returns the appropriate wallpaper resolution for all root windows.
223 static WallpaperResolution GetAppropriateResolution(); 223 static WallpaperResolution GetAppropriateResolution();
224 // This is a temporary variant of the previous method to investigate
225 // a problem with WallpaperManagetBrowserTest.
226 static WallpaperResolution GetAppropriateResolutionForTesting();
224 227
225 void SetCommandLineForTesting(base::CommandLine* command_line); 228 void SetCommandLineForTesting(base::CommandLine* command_line);
226 229
227 // Indicates imminent shutdown, allowing the WallpaperManager to remove any 230 // Indicates imminent shutdown, allowing the WallpaperManager to remove any
228 // observers it has registered. 231 // observers it has registered.
229 void Shutdown(); 232 void Shutdown();
230 233
231 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers. 234 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
232 void AddObservers(); 235 void AddObservers();
233 236
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 603
601 // Current decoded default image is stored in cache. 604 // Current decoded default image is stored in cache.
602 scoped_ptr<UserImage> default_wallpaper_image_; 605 scoped_ptr<UserImage> default_wallpaper_image_;
603 606
604 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); 607 DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
605 }; 608 };
606 609
607 } // namespace chromeos 610 } // namespace chromeos
608 611
609 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 612 #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