Componentize error pages strings

chrome/common/localized_error.cc

Index: chrome/common/localized_error.cc
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index f6d2fa709401ab922a67411c32bc8f5fc436b1be..4ce95ed1815dcc60a4a3a9a15b861ffe7ae7c836 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -16,12 +16,13 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/grit/google_chrome_strings.h"

[mmenke, 2015/11/30 23:29:10]

Why are these two still needed?

[blundell, 2015/12/01 11:33:44]

There are still strings from them used in this file. They're more generic (e.g.,
IDS_PRODUCT_NAME) and I need to decide where to put them -- they don't belong in
error_page_strings.grdp. Going to handle them in a followup.

 #include "components/error_page/common/error_page_params.h"
 #include "components/error_page/common/net_error_info.h"
+#include "components/strings/grit/components_chromium_strings.h"
+#include "components/strings/grit/components_google_chrome_strings.h"
+#include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/url_formatter.h"
-#include "grit/components_chromium_strings.h"
-#include "grit/components_google_chrome_strings.h"
-#include "grit/components_strings.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
@@ -32,11 +33,6 @@
 #include "base/win/windows_version.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
-#endif
-
 using blink::WebURLError;
 using error_page::OfflinePageStatus;