chrome/browser/chromeos/login/screens/network_screen.cc - Issue 448423002: Use a qualified path for grit includes 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 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« chrome/browser/chromeos/accessibility/accessibility_manager.cc ('K') | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_load_page.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/screens/network_screen.h"	5 #include "chrome/browser/chromeos/login/screens/network_screen.h"

6	6

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

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

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

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.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/grit/chromium_strings.h"

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

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

16 #include "chromeos/network/network_handler.h"	19 #include "chromeos/network/network_handler.h"

17 #include "chromeos/network/network_state_handler.h"	20 #include "chromeos/network/network_state_handler.h"

18 #include "grit/chromium_strings.h"

19 #include "grit/generated_resources.h"

20 #include "grit/theme_resources.h"

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

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

23	23

24 namespace {	24 namespace {

25	25

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

27 const int kConnectionTimeoutSec = 40;	27 const int kConnectionTimeoutSec = 40;

28	28

29 } // namespace	29 } // namespace

30	30

(...skipping 168 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
199 }	199 }

200	200

201 network_id_ = network_id;	201 network_id_ = network_id;

202 if (actor_) {	202 if (actor_) {

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

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

205 }	205 }

206 }	206 }

207	207

208 } // namespace chromeos	208 } // namespace chromeos

OLD	NEW