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/browser/chromeos/login/users/user_manager.h" | |
11 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
12 #include "chrome/grit/theme_resources.h" | 11 #include "chrome/grit/theme_resources.h" |
13 #include "chromeos/chromeos_switches.h" | 12 #include "chromeos/chromeos_switches.h" |
14 #include "chromeos/network/network_handler.h" | 13 #include "chromeos/network/network_handler.h" |
15 #include "chromeos/network/network_state.h" | 14 #include "chromeos/network/network_state.h" |
16 #include "chromeos/network/network_state_handler.h" | 15 #include "chromeos/network/network_state_handler.h" |
17 #include "third_party/cros_system_api/dbus/service_constants.h" | 16 #include "third_party/cros_system_api/dbus/service_constants.h" |
18 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
19 #include "ui/gfx/image/image_skia.h" | 18 #include "ui/gfx/image/image_skia.h" |
20 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 bool NetworkStateHelper::IsConnecting() const { | 79 bool NetworkStateHelper::IsConnecting() const { |
81 chromeos::NetworkStateHandler* nsh = | 80 chromeos::NetworkStateHandler* nsh = |
82 chromeos::NetworkHandler::Get()->network_state_handler(); | 81 chromeos::NetworkHandler::Get()->network_state_handler(); |
83 return nsh->ConnectingNetworkByType( | 82 return nsh->ConnectingNetworkByType( |
84 chromeos::NetworkTypePattern::Default()) != NULL; | 83 chromeos::NetworkTypePattern::Default()) != NULL; |
85 } | 84 } |
86 | 85 |
87 } // namespace login | 86 } // namespace login |
88 | 87 |
89 } // namespace chromeos | 88 } // namespace chromeos |
OLD | NEW |