Update flags used by offline pages and bookmarks

components/error_page/common/localized_error.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 "components/error_page/common/localized_error.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 1045 matching lines @@
     error_strings->Set("showSavedCopyButton", show_saved_copy_button);
   }
 
 #if defined(OS_ANDROID)
   // Offline button will not be provided when we want to show something in the
   // cache.
   if (!show_saved_copy_visible && has_offline_pages) {
     base::DictionaryValue* show_offline_pages_button =
         new base::DictionaryValue;
     base::string16 button_text = l10n_util::GetStringUTF16(
-        offline_pages::GetOfflinePageFeatureMode() ==
-            offline_pages::FeatureMode::ENABLED_AS_BOOKMARKS
-                ? IDS_ERRORPAGES_BUTTON_SHOW_OFFLINE_PAGES_AS_BOOKMARKS
-                : IDS_ERRORPAGES_BUTTON_SHOW_OFFLINE_PAGES);
+        IDS_ERRORPAGES_BUTTON_SHOW_OFFLINE_PAGES_AS_BOOKMARKS);

[fgorski, 2016/04/18 17:09:37]

I am not sure if we still want to point the users to bookmarks as there is no
saved offline section there. Could you check with Tal, if documentation is not
clear.

Or do you plan to revisit this area?

[jianli, 2016/04/18 21:17:00]

I will do it in a separate patch to hide/remove offline button in error pages.

     show_offline_pages_button->SetString("msg", button_text);
     error_strings->Set("showOfflinePagesButton", show_offline_pages_button);
   }
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
   // ChromeOS has its own diagnostics extension, which doesn't rely on a
   // browser-initiated dialog.
   can_show_network_diagnostics_dialog = true;
 #endif
@@ skipping 17 matching lines @@
 
 bool LocalizedError::HasStrings(const std::string& error_domain,
                                 int error_code) {
   // Whether or not the there are strings for an error does not depend on
   // whether or not the page was be generated by a POST, so just claim it was
   // not.
   return LookupErrorMap(error_domain, error_code, /*is_post=*/false) != nullptr;
 }
 
 }  // namespace error_page