chrome/browser/chromeos/login/helper.cc - Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc…

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

Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Cros some more Created 6 years, 4 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

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"	10 #include "chrome/browser/chromeos/login/users/user_manager.h"

11 #include "chromeos/chromeos_switches.h"	11 #include "chromeos/chromeos_switches.h"

12 #include "chromeos/network/network_handler.h"	12 #include "chromeos/network/network_handler.h"

13 #include "chromeos/network/network_state.h"	13 #include "chromeos/network/network_state.h"

14 #include "chromeos/network/network_state_handler.h"	14 #include "chromeos/network/network_state_handler.h"

15 #include "grit/generated_resources.h"	15 #include "grit/generated_resources.h"

16 #include "grit/theme_resources.h"	16 #include "grit/theme_resources.h"

17 #include "third_party/cros_system_api/dbus/service_constants.h"	17 #include "third_party/cros_system_api/dbus/service_constants.h"

18 #include "ui/base/l10n/l10n_util.h"	18 #include "ui/base/l10n/l10n_util.h"

19 #include "ui/base/resource/resource_bundle.h"

20 #include "ui/gfx/image/image_skia.h"	19 #include "ui/gfx/image/image_skia.h"

21 #include "ui/gfx/screen.h"	20 #include "ui/gfx/screen.h"

22	21

23 namespace chromeos {	22 namespace chromeos {

24	23

25 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {	24 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {

26 gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());	25 gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());

27 if (!size.IsEmpty()) {	26 if (!size.IsEmpty()) {

28 int horizontal_diff = bounds.width() - size.width();	27 int horizontal_diff = bounds.width() - size.width();

29 int vertical_diff = bounds.height() - size.height();	28 int vertical_diff = bounds.height() - size.height();

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 bool NetworkStateHelper::IsConnecting() const {	80 bool NetworkStateHelper::IsConnecting() const {

82 chromeos::NetworkStateHandler* nsh =	81 chromeos::NetworkStateHandler* nsh =

83 chromeos::NetworkHandler::Get()->network_state_handler();	82 chromeos::NetworkHandler::Get()->network_state_handler();

84 return nsh->ConnectingNetworkByType(	83 return nsh->ConnectingNetworkByType(

85 chromeos::NetworkTypePattern::Default()) != NULL;	84 chromeos::NetworkTypePattern::Default()) != NULL;

86 }	85 }

87	86

88 } // namespace login	87 } // namespace login

89	88

90 } // namespace chromeos	89 } // namespace chromeos

OLD	NEW