chrome/browser/ui/webui/help/help_utils_chromeos.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/ui/webui/help/help_utils_chromeos.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 3 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/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/help/version_updater_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/ui/webui/help/help_utils_chromeos.h"	5 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

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

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "chrome/browser/chromeos/settings/cros_settings.h"	11 #include "chrome/browser/chromeos/settings/cros_settings.h"

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

12 #include "chromeos/network/network_type_pattern.h"	13 #include "chromeos/network/network_type_pattern.h"

13 #include "chromeos/settings/cros_settings_names.h"	14 #include "chromeos/settings/cros_settings_names.h"

14 #include "grit/generated_resources.h"

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

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

17	17

18 namespace {	18 namespace {

19	19

20 const bool kDefaultUpdateOverCellularAllowed = false;	20 const bool kDefaultUpdateOverCellularAllowed = false;

21	21

22 } // namespace	22 } // namespace

23	23

24 namespace help_utils_chromeos {	24 namespace help_utils_chromeos {

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH);	57 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH);

58 if (type == shill::kTypeCellular)	58 if (type == shill::kTypeCellular)

59 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR);	59 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR);

60 if (type == shill::kTypeVPN)	60 if (type == shill::kTypeVPN)

61 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN);	61 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN);

62 NOTREACHED();	62 NOTREACHED();

63 return base::string16();	63 return base::string16();

64 }	64 }

65	65

66 } // namespace help_utils_chromeos	66 } // namespace help_utils_chromeos

OLD	NEW