chrome/browser/ui/webui/chromeos/login/oobe_ui.cc - Issue 10698140: Remove "2" suffixes from options2 code.

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

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests Created 8 years, 5 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/ui/webui/chromeos/login/network_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/proxy_settings_ui.h » ('j') | chrome/browser/ui/webui/options2/advanced_options_utils.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	22 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

23 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"	23 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"

24 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"	24 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"

25 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_scr een_handler.h"	25 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_scr een_handler.h"

26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"	26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"

27 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"	27 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"

28 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"	28 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"

29 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"	29 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

30 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"	30 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"

31 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"	31 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"

32 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"	32 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"

33 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_source2.h"	33 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h"

34 #include "chrome/browser/ui/webui/theme_source.h"	34 #include "chrome/browser/ui/webui/theme_source.h"

35 #include "chrome/common/chrome_switches.h"	35 #include "chrome/common/chrome_switches.h"

36 #include "chrome/common/jstemplate_builder.h"	36 #include "chrome/common/jstemplate_builder.h"

37 #include "chrome/common/url_constants.h"	37 #include "chrome/common/url_constants.h"

38 #include "content/public/browser/web_contents.h"	38 #include "content/public/browser/web_contents.h"

39 #include "content/public/browser/web_ui.h"	39 #include "content/public/browser/web_ui.h"

40 #include "grit/browser_resources.h"	40 #include "grit/browser_resources.h"

41 #include "ui/base/layout.h"	41 #include "ui/base/layout.h"

42 #include "ui/base/resource/resource_bundle.h"	42 #include "ui/base/resource/resource_bundle.h"

43	43

(...skipping 227 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
271	271

272 void OobeUI::ResetSigninScreenHandlerDelegate() {	272 void OobeUI::ResetSigninScreenHandlerDelegate() {

273 signin_screen_handler_->SetDelegate(NULL);	273 signin_screen_handler_->SetDelegate(NULL);

274 }	274 }

275	275

276 void OobeUI::OnLoginPromptVisible() {	276 void OobeUI::OnLoginPromptVisible() {

277 user_image_screen_actor_->CheckCameraPresence();	277 user_image_screen_actor_->CheckCameraPresence();

278 }	278 }

279	279

280 } // namespace chromeos	280 } // namespace chromeos

OLD	NEW