chrome/browser/chromeos/login/screens/network_screen.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

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

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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

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/screens/network_screen.h"	5 #include "chrome/browser/chromeos/login/screens/network_screen.h"

6	6

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

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

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/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/help_app_launcher.h"	11 #include "chrome/browser/chromeos/login/help_app_launcher.h"

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

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

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

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

16 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"	16 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"

17 #include "grit/chromium_strings.h"	17 #include "grit/chromium_strings.h"

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

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 }	190 }

191	191

192 network_id_ = network_id;	192 network_id_ = network_id;

193 if (actor_) {	193 if (actor_) {

194 actor_->ShowConnectingStatus(continue_pressed_, network_id_);	194 actor_->ShowConnectingStatus(continue_pressed_, network_id_);

195 actor_->EnableContinue(false);	195 actor_->EnableContinue(false);

196 }	196 }

197 }	197 }

198	198

199 } // namespace chromeos	199 } // namespace chromeos

OLD	NEW