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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 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 | Annotate | Revision Log
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 <string> 7 #include <string>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 32 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
33 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 33 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
34 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 34 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
35 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h" 35 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h"
36 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 36 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
37 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 37 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
38 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h" 38 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
39 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 39 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
40 #include "chrome/browser/ui/webui/theme_source.h" 40 #include "chrome/browser/ui/webui/theme_source.h"
41 #include "chrome/common/chrome_constants.h" 41 #include "chrome/common/chrome_constants.h"
42 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
43 #include "chromeos/chromeos_switches.h"
44 #include "content/public/browser/web_ui.h" 44 #include "content/public/browser/web_ui.h"
45 #include "content/public/browser/web_ui_data_source.h" 45 #include "content/public/browser/web_ui_data_source.h"
46 #include "grit/browser_resources.h" 46 #include "grit/browser_resources.h"
47 #include "ui/base/resource/resource_bundle.h" 47 #include "ui/base/resource/resource_bundle.h"
48 #include "ui/webui/web_ui_util.h" 48 #include "ui/webui/web_ui_util.h"
49 49
50 namespace chromeos { 50 namespace chromeos {
51 51
52 namespace { 52 namespace {
53 53
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 void OobeUI::OnCurrentScreenChanged(const std::string& screen) { 426 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
427 if (screen_ids_.count(screen)) { 427 if (screen_ids_.count(screen)) {
428 current_screen_ = screen_ids_[screen]; 428 current_screen_ = screen_ids_[screen];
429 } else { 429 } else {
430 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 430 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
431 current_screen_ = SCREEN_UNKNOWN; 431 current_screen_ = SCREEN_UNKNOWN;
432 } 432 }
433 } 433 }
434 434
435 } // namespace chromeos 435 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698