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

Side by Side Diff: chrome/browser/signin/easy_unlock_screenlock_state_handler.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/signin/easy_unlock_screenlock_state_handler.h" 5 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
6 6
7 #include <stddef.h>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h"
10 #include "chrome/browser/signin/easy_unlock_metrics.h" 13 #include "chrome/browser/signin/easy_unlock_metrics.h"
11 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
12 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
13 16
14 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
15 #include "ash/system/chromeos/devicetype_utils.h" 18 #include "ash/system/chromeos/devicetype_utils.h"
16 #endif 19 #endif
17 20
18 using proximity_auth::ScreenlockState; 21 using proximity_auth::ScreenlockState;
19 22
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE)); 389 IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE));
387 } 390 }
388 } else if (existing_auth_type != 391 } else if (existing_auth_type !=
389 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) { 392 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) {
390 screenlock_bridge_->lock_handler()->SetAuthType( 393 screenlock_bridge_->lock_handler()->SetAuthType(
391 account_id_, 394 account_id_,
392 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, 395 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
393 base::string16()); 396 base::string16());
394 } 397 }
395 } 398 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698