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

Side by Side Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/users/wallpaper/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
6 6
7 #include <numeric> 7 #include <numeric>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // Apply device customization. 367 // Apply device customization.
368 if (ShouldUseCustomizedDefaultWallpaper()) { 368 if (ShouldUseCustomizedDefaultWallpaper()) {
369 SetDefaultWallpaperPath(GetCustomizedWallpaperDefaultRescaledFileName( 369 SetDefaultWallpaperPath(GetCustomizedWallpaperDefaultRescaledFileName(
370 wallpaper::kSmallWallpaperSuffix), 370 wallpaper::kSmallWallpaperSuffix),
371 scoped_ptr<gfx::ImageSkia>().Pass(), 371 scoped_ptr<gfx::ImageSkia>().Pass(),
372 GetCustomizedWallpaperDefaultRescaledFileName( 372 GetCustomizedWallpaperDefaultRescaledFileName(
373 wallpaper::kLargeWallpaperSuffix), 373 wallpaper::kLargeWallpaperSuffix),
374 scoped_ptr<gfx::ImageSkia>().Pass()); 374 scoped_ptr<gfx::ImageSkia>().Pass());
375 } 375 }
376 376
377 CommandLine* command_line = GetCommandLine(); 377 base::CommandLine* command_line = GetCommandLine();
378 if (command_line->HasSwitch(chromeos::switches::kGuestSession)) { 378 if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
379 // Guest wallpaper should be initialized when guest login. 379 // Guest wallpaper should be initialized when guest login.
380 // Note: This maybe called before login. So IsLoggedInAsGuest can not be 380 // Note: This maybe called before login. So IsLoggedInAsGuest can not be
381 // used here to determine if current user is guest. 381 // used here to determine if current user is guest.
382 return; 382 return;
383 } 383 }
384 384
385 if (command_line->HasSwitch(::switches::kTestType)) 385 if (command_line->HasSwitch(::switches::kTestType))
386 WizardController::SetZeroDelays(); 386 WizardController::SetZeroDelays();
387 387
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 } 1012 }
1013 } 1013 }
1014 1014
1015 if (need_update_screen) { 1015 if (need_update_screen) {
1016 DoSetDefaultWallpaper(std::string(), 1016 DoSetDefaultWallpaper(std::string(),
1017 MovableOnDestroyCallbackHolder().Pass()); 1017 MovableOnDestroyCallbackHolder().Pass());
1018 } 1018 }
1019 } 1019 }
1020 1020
1021 } // namespace chromeos 1021 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698