Componentize error pages strings

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
@@ skipping 11 matching lines @@
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/components_scaled_resources.h"
+#include "grit/components_strings.h"

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

Why is this one needed?  This file doesn't use a string from the error pages.

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

Good catch. IDS_SECURE_CONNECTION_EV was buried among the error page strings. I
moved it back to generated_resources.grd, since localized_error.cc doesn't use
it.

 #include "grit/theme_resources.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
@@ skipping 232 matching lines @@
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   SecurityStateModel::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
   return ((security_level == SecurityStateModel::NONE) ||
           (security_level == SecurityStateModel::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }