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

Side by Side Diff: chrome/browser/chromeos/login/user_image_screen.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/chromeos/login/user_image_screen.h" 5 #include "chrome/browser/chromeos/login/user_image_screen.h"
6 6
7 #include "app/resource_bundle.h"
8 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
9 #include "base/time.h" 8 #include "base/time.h"
10 #include "chrome/browser/chromeos/login/login_utils.h" 9 #include "chrome/browser/chromeos/login/login_utils.h"
11 #include "chrome/browser/chromeos/login/screen_observer.h" 10 #include "chrome/browser/chromeos/login/screen_observer.h"
12 #include "chrome/browser/chromeos/login/user_image_downloader.h" 11 #include "chrome/browser/chromeos/login/user_image_downloader.h"
13 #include "chrome/browser/chromeos/login/user_image_view.h" 12 #include "chrome/browser/chromeos/login/user_image_view.h"
14 #include "chrome/browser/chromeos/login/user_manager.h" 13 #include "chrome/browser/chromeos/login/user_manager.h"
15 #include "chrome/common/notification_service.h" 14 #include "chrome/common/notification_service.h"
16 #include "chrome/common/notification_type.h" 15 #include "chrome/common/notification_type.h"
17 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
17 #include "ui/base/resource/resource_bundle.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 namespace { 21 namespace {
22 22
23 // The resolution of the picture we want to get from the camera. 23 // The resolution of the picture we want to get from the camera.
24 const int kFrameWidth = 480; 24 const int kFrameWidth = 480;
25 const int kFrameHeight = 480; 25 const int kFrameHeight = 480;
26 26
27 // Maximum number of capture failures we ignore before we try to initialize 27 // Maximum number of capture failures we ignore before we try to initialize
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 void UserImageScreen::InitCamera() { 154 void UserImageScreen::InitCamera() {
155 if (view()) 155 if (view())
156 view()->ShowCameraInitializing(); 156 view()->ShowCameraInitializing();
157 camera_->Initialize(kFrameWidth, kFrameHeight); 157 camera_->Initialize(kFrameWidth, kFrameHeight);
158 } 158 }
159 159
160 } // namespace chromeos 160 } // namespace chromeos
161 161
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_controller.cc ('k') | chrome/browser/chromeos/login/user_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698