MD History: UI polish pass

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 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/webui/history_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 83 matching lines @@
   source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED);
   source->AddLocalizedString("searchButton", IDS_HISTORY_SEARCH_BUTTON);
   source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
   source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS);
   source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL);
   source->AddLocalizedString("removeSelected",
                              IDS_HISTORY_REMOVE_SELECTED_ITEMS);
   source->AddLocalizedString("clearAllHistory",
                              IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG);
 
-  source->AddString("deleteWarning",
-                    HistoryUI::GetDeleteWarningString(profile));
+  auto availability = IncognitoModePrefs::GetAvailability(profile->GetPrefs());
+  base::string16 delete_string = availability == IncognitoModePrefs::ENABLED
+             ? l10n_util::GetStringFUTF16(
+                   IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING,
+                   base::UTF8ToUTF16(kIncognitoModeShortcut))
+             : l10n_util::GetStringUTF16(
+                   IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO);
+  source->AddString("deleteWarning", delete_string);
 
   source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK);
   source->AddLocalizedString("actionMenuDescription",
                              IDS_HISTORY_ACTION_MENU_DESCRIPTION);
   source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
   source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
   source->AddLocalizedString("rangeLabel", IDS_HISTORY_RANGE_LABEL);
   source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME);
   source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK);
   source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH);
@@ skipping 76 matching lines @@
 }
 
 HistoryUI::~HistoryUI() {}
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }
-
-// static
-base::string16 HistoryUI::GetDeleteWarningString(Profile* profile) {
-  auto availability = IncognitoModePrefs::GetAvailability(profile->GetPrefs());
-  return availability == IncognitoModePrefs::ENABLED
-             ? l10n_util::GetStringFUTF16(
-                   IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING,
-                   base::UTF8ToUTF16(kIncognitoModeShortcut))
-             : l10n_util::GetStringUTF16(
-                   IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO);
-}