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

Side by Side Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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/extensions/api/easy_unlock_private/easy_unlock_private_ api.h" 5 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_ api.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64url.h" 10 #include "base/base64url.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "components/proximity_auth/switches.h" 46 #include "components/proximity_auth/switches.h"
47 #include "components/signin/core/account_id/account_id.h" 47 #include "components/signin/core/account_id/account_id.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
50 #include "extensions/browser/browser_context_keyed_api_factory.h" 50 #include "extensions/browser/browser_context_keyed_api_factory.h"
51 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
52 #include "ui/gfx/geometry/rect.h" 52 #include "ui/gfx/geometry/rect.h"
53 #include "ui/gfx/range/range.h" 53 #include "ui/gfx/range/range.h"
54 54
55 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
56 #include "ash/system/chromeos/devicetype_utils.h" 56 #include "ash/common/system/chromeos/devicetype_utils.h"
57 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager. h" 57 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager. h"
58 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_ factory.h" 58 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_ factory.h"
59 #include "components/user_manager/user.h" 59 #include "components/user_manager/user.h"
60 #include "components/user_manager/user_manager.h" 60 #include "components/user_manager/user_manager.h"
61 #endif 61 #endif
62 62
63 using proximity_auth::ScreenlockState; 63 using proximity_auth::ScreenlockState;
64 64
65 namespace extensions { 65 namespace extensions {
66 66
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 ->GetDeviceAddress(extension(), params->connection_id); 1178 ->GetDeviceAddress(extension(), params->connection_id);
1179 results_ = 1179 results_ =
1180 easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create( 1180 easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create(
1181 device_address); 1181 device_address);
1182 if (device_address.empty()) 1182 if (device_address.empty())
1183 SetError("Invalid connectionId."); 1183 SetError("Invalid connectionId.");
1184 return true; 1184 return true;
1185 } 1185 }
1186 1186
1187 } // namespace extensions 1187 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698