Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4055)

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc

Issue 2510083006: chromeos: Move ownership of ash VPN provider list from chrome into ash (Closed)
Patch Set: Collapse VPNProvider::Key and VPNProvider structs Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
index c1ad963460f81d8f8789081271cc1c8941159d4f..9adca4b62debe590d4d8081291388f72ecf34279 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include "ash/common/strings/grit/ash_strings.h"
#include "base/macros.h"
#include "base/values.h"
#include "chrome/grit/generated_resources.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
namespace chromeos {
namespace internet_options_strings {
@@ -35,7 +35,7 @@ StringResource kStringResources[] = {
IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE},
{"defaultThirdPartyProviderName",
IDS_OPTIONS_SETTINGS_SECTION_DEFAULT_THIRD_PARTY_PROVIDER_NAME},
- {"vpnBuiltInProvider", IDS_NETWORK_VPN_BUILT_IN_PROVIDER},
+ {"vpnBuiltInProvider", IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER},
{"joinOtherNetwork", IDS_OPTIONS_SETTINGS_NETWORK_OTHER},
{"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED},
{"networkProhibited", IDS_OPTIONS_SETTINGS_NETWORK_PROHIBITED},

Powered by Google App Engine
This is Rietveld 408576698