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

Side by Side Diff: ash/desktop_background/desktop_background_controller_unittest.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 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 unified diff | Download patch
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.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) 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 "ash/desktop_background/desktop_background_controller.h" 5 #include "ash/desktop_background/desktop_background_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cstdlib> 8 #include <cstdlib>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/common/ash_switches.h"
11 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
12 #include "ash/desktop_background/desktop_background_view.h" 12 #include "ash/desktop_background/desktop_background_view.h"
13 #include "ash/desktop_background/desktop_background_widget_controller.h" 13 #include "ash/desktop_background/desktop_background_widget_controller.h"
14 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
17 #include "ash/test/test_user_wallpaper_delegate.h" 17 #include "ash/test/test_user_wallpaper_delegate.h"
18 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
19 #include "base/run_loop.h" 19 #include "base/run_loop.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 { 491 {
492 SCOPED_TRACE(base::StringPrintf("1200x600/u@1.5 low resolution")); 492 SCOPED_TRACE(base::StringPrintf("1200x600/u@1.5 low resolution"));
493 controller_->SetWallpaperImage(image_low_res, WALLPAPER_LAYOUT_CENTER); 493 controller_->SetWallpaperImage(image_low_res, WALLPAPER_LAYOUT_CENTER);
494 WallpaperFitToNativeResolution( 494 WallpaperFitToNativeResolution(
495 desktop_background_view(), low_dsf, low_resolution.width(), 495 desktop_background_view(), low_dsf, low_resolution.width(),
496 low_resolution.height(), kCustomWallpaperColor); 496 low_resolution.height(), kCustomWallpaperColor);
497 } 497 }
498 } 498 }
499 499
500 } // namespace ash 500 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698