chrome/browser/chromeos/login/network_screen.cc - Issue 8436002: [cros] Remove Views implementation for login/OOBE.

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/network_screen.cc

Issue 8436002: [cros] Remove Views implementation for login/OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 9 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/network_screen.h"	5 #include "chrome/browser/chromeos/login/network_screen.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/string16.h"	8 #include "base/string16.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "chrome/browser/chromeos/cros/cros_library.h"	10 #include "chrome/browser/chromeos/cros/cros_library.h"

11 #include "chrome/browser/chromeos/login/background_view.h"

12 #include "chrome/browser/chromeos/login/helper.h"	11 #include "chrome/browser/chromeos/login/helper.h"

13 #include "chrome/browser/chromeos/login/help_app_launcher.h"	12 #include "chrome/browser/chromeos/login/help_app_launcher.h"

14 #include "chrome/browser/chromeos/login/login_utils.h"	13 #include "chrome/browser/chromeos/login/login_utils.h"

15 #include "chrome/browser/chromeos/login/network_selection_view.h"

16 #include "chrome/browser/chromeos/login/screen_observer.h"	14 #include "chrome/browser/chromeos/login/screen_observer.h"

17 #include "chrome/browser/chromeos/login/views_network_screen_actor.h"

18 #include "grit/chromium_strings.h"	15 #include "grit/chromium_strings.h"

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

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

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

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

23	20

24 namespace {	21 namespace {

25	22

26 // Time in seconds for connection timeout.	23 // Time in seconds for connection timeout.

27 const int kConnectionTimeoutSec = 15;	24 const int kConnectionTimeoutSec = 15;

(...skipping 148 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
176 &NetworkScreen::OnConnectionTimeout);	173 &NetworkScreen::OnConnectionTimeout);

177 }	174 }

178	175

179 network_id_ = network_id;	176 network_id_ = network_id;

180 actor_->ShowConnectingStatus(continue_pressed_, network_id_);	177 actor_->ShowConnectingStatus(continue_pressed_, network_id_);

181	178

182 actor_->EnableContinue(false);	179 actor_->EnableContinue(false);

183 }	180 }

184	181

185 } // namespace chromeos	182 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/login/network_screen.h ('k') | chrome/browser/chromeos/login/network_screen_browsertest.cc » ('j') | no next file with comments »