chrome/browser/chromeos/login/helper.cc - Issue 300623008: Move NetworkTypePattern to its own file

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 300623008: Move NetworkTypePattern to its own file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/proxy_settings_dialog.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 "chromeos/network/shill_property_util.h"

16 #include "google_apis/gaia/gaia_auth_util.h"	15 #include "google_apis/gaia/gaia_auth_util.h"

17 #include "grit/generated_resources.h"	16 #include "grit/generated_resources.h"

18 #include "grit/theme_resources.h"	17 #include "grit/theme_resources.h"

19 #include "third_party/cros_system_api/dbus/service_constants.h"	18 #include "third_party/cros_system_api/dbus/service_constants.h"

20 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

21 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

22 #include "ui/gfx/image/image_skia.h"	21 #include "ui/gfx/image/image_skia.h"

23 #include "ui/gfx/screen.h"	22 #include "ui/gfx/screen.h"

24	23

25 namespace chromeos {	24 namespace chromeos {

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 bool NetworkStateHelper::IsConnecting() const {	88 bool NetworkStateHelper::IsConnecting() const {

90 chromeos::NetworkStateHandler* nsh =	89 chromeos::NetworkStateHandler* nsh =

91 chromeos::NetworkHandler::Get()->network_state_handler();	90 chromeos::NetworkHandler::Get()->network_state_handler();

92 return nsh->ConnectingNetworkByType(	91 return nsh->ConnectingNetworkByType(

93 chromeos::NetworkTypePattern::Default()) != NULL;	92 chromeos::NetworkTypePattern::Default()) != NULL;

94 }	93 }

95	94

96 } // namespace login	95 } // namespace login

97	96

98 } // namespace chromeos	97 } // namespace chromeos

OLD	NEW