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

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

Issue 7054022: Use int64 instead of int for cloud policy infrastructure-delay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_view.h" 5 #include "chrome/browser/chromeos/login/user_image_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/login/default_images_view.h" 9 #include "chrome/browser/chromeos/login/default_images_view.h"
10 #include "chrome/browser/chromeos/login/default_user_images.h" 10 #include "chrome/browser/chromeos/login/default_user_images.h"
(...skipping 12 matching lines...) Expand all
23 #include "views/controls/button/native_button.h" 23 #include "views/controls/button/native_button.h"
24 #include "views/controls/label.h" 24 #include "views/controls/label.h"
25 #include "views/layout/grid_layout.h" 25 #include "views/layout/grid_layout.h"
26 26
27 namespace { 27 namespace {
28 28
29 // The delay of triggering initialization of the user policy subsystem 29 // The delay of triggering initialization of the user policy subsystem
30 // after the user image selection screen is initialized. This makes sure that 30 // after the user image selection screen is initialized. This makes sure that
31 // user policy network requests are made while the system is idle waiting for 31 // user policy network requests are made while the system is idle waiting for
32 // user input. 32 // user input.
33 const int kPolicyServiceInitializationDelayMilliseconds = 400; 33 const int64 kPolicyServiceInitializationDelayMilliseconds = 400;
34 34
35 // Margin in pixels from the left and right borders of screen's contents. 35 // Margin in pixels from the left and right borders of screen's contents.
36 const int kHorizontalMargin = 10; 36 const int kHorizontalMargin = 10;
37 // Margin in pixels from the top and bottom borders of screen's contents. 37 // Margin in pixels from the top and bottom borders of screen's contents.
38 const int kVerticalMargin = 10; 38 const int kVerticalMargin = 10;
39 // Padding between horizontally neighboring elements. 39 // Padding between horizontally neighboring elements.
40 const int kHorizontalPadding = 10; 40 const int kHorizontalPadding = 10;
41 // Padding between vertically neighboring elements. 41 // Padding between vertically neighboring elements.
42 const int kVerticalPadding = 10; 42 const int kVerticalPadding = 10;
43 // Color for splitter separating contents from OK button. 43 // Color for splitter separating contents from OK button.
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 return; 255 return;
256 delegate_->StopCamera(); 256 delegate_->StopCamera();
257 ok_button_->SetEnabled(true); 257 ok_button_->SetEnabled(true);
258 ok_button_->RequestFocus(); 258 ok_button_->RequestFocus();
259 take_photo_view_->SetImage( 259 take_photo_view_->SetImage(
260 ResourceBundle::GetSharedInstance().GetBitmapNamed( 260 ResourceBundle::GetSharedInstance().GetBitmapNamed(
261 kDefaultImageResources[image_index])); 261 kDefaultImageResources[image_index]));
262 } 262 }
263 263
264 } // namespace chromeos 264 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/base_login_display_host.cc ('k') | chrome/browser/policy/browser_policy_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698