OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/helper.h" | 5 #include "chrome/browser/chromeos/login/helper.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
(...skipping 24 matching lines...) Expand all Loading... | |
35 static const int kBaseUserImageSize = 220; | 35 static const int kBaseUserImageSize = 220; |
36 float scale_factor = gfx::Display::GetForcedDeviceScaleFactor(); | 36 float scale_factor = gfx::Display::GetForcedDeviceScaleFactor(); |
37 if (scale_factor > 1.0f) | 37 if (scale_factor > 1.0f) |
38 return static_cast<int>(scale_factor * kBaseUserImageSize); | 38 return static_cast<int>(scale_factor * kBaseUserImageSize); |
39 return kBaseUserImageSize * gfx::ImageSkia::GetMaxSupportedScale(); | 39 return kBaseUserImageSize * gfx::ImageSkia::GetMaxSupportedScale(); |
40 } | 40 } |
41 | 41 |
42 namespace login { | 42 namespace login { |
43 | 43 |
44 bool LoginScrollIntoViewEnabled() { | 44 bool LoginScrollIntoViewEnabled() { |
45 #if defined(USE_ATHENA) | |
46 // TODO(dpolukhin): temporary always enable overscroll mode for Athena, | |
Nikita (slow)
2014/09/08 09:53:17
Please file a work item and assign it to me - to f
Dmitry Polukhin
2014/09/08 13:28:19
Done.
| |
47 // later we will need special API in Blink to specify which element need to | |
48 // be centered when virtual keyboard shown. | |
49 return false; | |
50 #else | |
45 return !CommandLine::ForCurrentProcess()->HasSwitch( | 51 return !CommandLine::ForCurrentProcess()->HasSwitch( |
46 chromeos::switches::kDisableLoginScrollIntoView); | 52 chromeos::switches::kDisableLoginScrollIntoView); |
53 #endif | |
47 } | 54 } |
48 | 55 |
49 NetworkStateHelper::NetworkStateHelper() {} | 56 NetworkStateHelper::NetworkStateHelper() {} |
50 NetworkStateHelper::~NetworkStateHelper() {} | 57 NetworkStateHelper::~NetworkStateHelper() {} |
51 | 58 |
52 base::string16 NetworkStateHelper::GetCurrentNetworkName() const { | 59 base::string16 NetworkStateHelper::GetCurrentNetworkName() const { |
53 NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler(); | 60 NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler(); |
54 const NetworkState* network = | 61 const NetworkState* network = |
55 nsh->ConnectedNetworkByType(NetworkTypePattern::NonVirtual()); | 62 nsh->ConnectedNetworkByType(NetworkTypePattern::NonVirtual()); |
56 if (network) { | 63 if (network) { |
(...skipping 21 matching lines...) Expand all Loading... | |
78 bool NetworkStateHelper::IsConnecting() const { | 85 bool NetworkStateHelper::IsConnecting() const { |
79 chromeos::NetworkStateHandler* nsh = | 86 chromeos::NetworkStateHandler* nsh = |
80 chromeos::NetworkHandler::Get()->network_state_handler(); | 87 chromeos::NetworkHandler::Get()->network_state_handler(); |
81 return nsh->ConnectingNetworkByType( | 88 return nsh->ConnectingNetworkByType( |
82 chromeos::NetworkTypePattern::Default()) != NULL; | 89 chromeos::NetworkTypePattern::Default()) != NULL; |
83 } | 90 } |
84 | 91 |
85 } // namespace login | 92 } // namespace login |
86 | 93 |
87 } // namespace chromeos | 94 } // namespace chromeos |
OLD | NEW |