chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values.

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)

Patch Set: Address comments Created 3 years, 11 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:

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/user_image_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

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

11 #include "base/metrics/histogram_macros.h"	11 #include "base/metrics/histogram_macros.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

14 #include "chrome/browser/chromeos/login/existing_user_controller.h"	14 #include "chrome/browser/chromeos/login/existing_user_controller.h"

	15 #include "chrome/browser/chromeos/login/oobe_screen.h"

15 #include "chrome/browser/chromeos/login/screens/user_image_model.h"	16 #include "chrome/browser/chromeos/login/screens/user_image_model.h"

16 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"	17 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"

17 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h"	18 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h"

18 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"

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

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

21 #include "chrome/grit/browser_resources.h"	21 #include "chrome/grit/browser_resources.h"

22 #include "chrome/grit/generated_resources.h"	22 #include "chrome/grit/generated_resources.h"

23 #include "chromeos/audio/chromeos_sounds.h"	23 #include "chromeos/audio/chromeos_sounds.h"

24 #include "components/login/localized_values_builder.h"	24 #include "components/login/localized_values_builder.h"

25 #include "components/strings/grit/components_strings.h"	25 #include "components/strings/grit/components_strings.h"

26 #include "components/user_manager/user.h"	26 #include "components/user_manager/user.h"

27 #include "media/audio/sounds/sounds_manager.h"	27 #include "media/audio/sounds/sounds_manager.h"

28 #include "net/base/data_url.h"	28 #include "net/base/data_url.h"

(...skipping 163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
192 base::TimeDelta delta = base::Time::Now() - screen_show_time_;	192 base::TimeDelta delta = base::Time::Now() - screen_show_time_;

193 VLOG(1) << "Screen load time: " << delta.InSecondsF();	193 VLOG(1) << "Screen load time: " << delta.InSecondsF();

194 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta);	194 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta);

195 }	195 }

196	196

197 void UserImageScreenHandler::HideCurtain() {	197 void UserImageScreenHandler::HideCurtain() {

198 CallJS("hideCurtain");	198 CallJS("hideCurtain");

199 }	199 }

200	200

201 } // namespace chromeos	201 } // namespace chromeos

OLD	NEW