| 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" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "url/gurl.h" | 31 #include "url/gurl.h" |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 const char kJsScreenPath[] = "login.UserImageScreen"; | 35 const char kJsScreenPath[] = "login.UserImageScreen"; |
| 36 | 36 |
| 37 } // namespace | 37 } // namespace |
| 38 | 38 |
| 39 namespace chromeos { | 39 namespace chromeos { |
| 40 | 40 |
| 41 UserImageScreenHandler::UserImageScreenHandler() { | 41 UserImageScreenHandler::UserImageScreenHandler() |
| 42 : BaseScreenHandler(kScreenId) { |
| 42 set_call_js_prefix(kJsScreenPath); | 43 set_call_js_prefix(kJsScreenPath); |
| 43 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | 44 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| 44 media::SoundsManager* manager = media::SoundsManager::Get(); | 45 media::SoundsManager* manager = media::SoundsManager::Get(); |
| 45 manager->Initialize(SOUND_OBJECT_DELETE, | 46 manager->Initialize(SOUND_OBJECT_DELETE, |
| 46 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV)); | 47 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV)); |
| 47 manager->Initialize(SOUND_CAMERA_SNAP, | 48 manager->Initialize(SOUND_CAMERA_SNAP, |
| 48 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV)); | 49 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV)); |
| 49 } | 50 } |
| 50 | 51 |
| 51 UserImageScreenHandler::~UserImageScreenHandler() { | 52 UserImageScreenHandler::~UserImageScreenHandler() { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 69 screen_ = nullptr; | 70 screen_ = nullptr; |
| 70 BaseScreenHandler::SetBaseScreen(nullptr); | 71 BaseScreenHandler::SetBaseScreen(nullptr); |
| 71 } | 72 } |
| 72 | 73 |
| 73 void UserImageScreenHandler::Show() { | 74 void UserImageScreenHandler::Show() { |
| 74 if (!page_is_ready()) { | 75 if (!page_is_ready()) { |
| 75 show_on_init_ = true; | 76 show_on_init_ = true; |
| 76 return; | 77 return; |
| 77 } | 78 } |
| 78 screen_show_time_ = base::Time::Now(); | 79 screen_show_time_ = base::Time::Now(); |
| 79 ShowScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER); | 80 ShowScreen(kScreenId); |
| 80 | 81 |
| 81 // When shown, query camera presence. | 82 // When shown, query camera presence. |
| 82 if (screen_ && is_ready_) | 83 if (screen_ && is_ready_) |
| 83 screen_->OnScreenReady(); | 84 screen_->OnScreenReady(); |
| 84 } | 85 } |
| 85 | 86 |
| 86 void UserImageScreenHandler::Hide() { | 87 void UserImageScreenHandler::Hide() { |
| 87 } | 88 } |
| 88 | 89 |
| 89 void UserImageScreenHandler::DeclareLocalizedValues( | 90 void UserImageScreenHandler::DeclareLocalizedValues( |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 base::TimeDelta delta = base::Time::Now() - screen_show_time_; | 190 base::TimeDelta delta = base::Time::Now() - screen_show_time_; |
| 190 VLOG(1) << "Screen load time: " << delta.InSecondsF(); | 191 VLOG(1) << "Screen load time: " << delta.InSecondsF(); |
| 191 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta); | 192 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta); |
| 192 } | 193 } |
| 193 | 194 |
| 194 void UserImageScreenHandler::HideCurtain() { | 195 void UserImageScreenHandler::HideCurtain() { |
| 195 CallJS("hideCurtain"); | 196 CallJS("hideCurtain"); |
| 196 } | 197 } |
| 197 | 198 |
| 198 } // namespace chromeos | 199 } // namespace chromeos |
| OLD | NEW |