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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 24980006: ash: Remove old lock animation implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 7 years, 2 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 | « chrome/browser/resources/chromeos/login/oobe.html ('k') | 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/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 handlers_[i]->GetLocalizedStrings(localized_strings); 368 handlers_[i]->GetLocalizedStrings(localized_strings);
369 webui::SetFontAndTextDirection(localized_strings); 369 webui::SetFontAndTextDirection(localized_strings);
370 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); 370 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings);
371 371
372 #if defined(GOOGLE_CHROME_BUILD) 372 #if defined(GOOGLE_CHROME_BUILD)
373 localized_strings->SetString("buildType", "chrome"); 373 localized_strings->SetString("buildType", "chrome");
374 #else 374 #else
375 localized_strings->SetString("buildType", "chromium"); 375 localized_strings->SetString("buildType", "chromium");
376 #endif 376 #endif
377 377
378 if (CommandLine::ForCurrentProcess()->
379 HasSwitch(ash::switches::kAshDisableNewLockAnimations))
380 localized_strings->SetString("lockAnimationsType", "old");
381 else
382 localized_strings->SetString("lockAnimationsType", "new");
383
384 // If we're not doing boot animation then WebUI should trigger 378 // If we're not doing boot animation then WebUI should trigger
385 // wallpaper load on boot. 379 // wallpaper load on boot.
386 if (CommandLine::ForCurrentProcess()->HasSwitch( 380 if (CommandLine::ForCurrentProcess()->HasSwitch(
387 switches::kDisableBootAnimation)) { 381 switches::kDisableBootAnimation)) {
388 localized_strings->SetString("bootIntoWallpaper", "on"); 382 localized_strings->SetString("bootIntoWallpaper", "on");
389 } else { 383 } else {
390 localized_strings->SetString("bootIntoWallpaper", "off"); 384 localized_strings->SetString("bootIntoWallpaper", "off");
391 } 385 }
392 386
393 bool keyboard_driven_oobe = 387 bool keyboard_driven_oobe =
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 observer_list_, 479 observer_list_,
486 OnCurrentScreenChanged(current_screen_, new_screen)); 480 OnCurrentScreenChanged(current_screen_, new_screen));
487 current_screen_ = new_screen; 481 current_screen_ = new_screen;
488 } else { 482 } else {
489 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 483 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
490 current_screen_ = SCREEN_UNKNOWN; 484 current_screen_ = SCREEN_UNKNOWN;
491 } 485 }
492 } 486 }
493 487
494 } // namespace chromeos 488 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698