ToolbarModel: Supply offline page status.

chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc

 // Copyright 2016 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/chrome_toolbar_model_delegate.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/prefs/pref_service.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 
 #if !defined(OS_ANDROID)
 #include "components/omnibox/browser/vector_icons.h" // nogncheck
 #include "components/toolbar/vector_icons.h"  // nogncheck
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/offline_pages/offline_page_utils.h"
+#endif
+
 ChromeToolbarModelDelegate::ChromeToolbarModelDelegate() {}
 
 ChromeToolbarModelDelegate::~ChromeToolbarModelDelegate() {}
 
 base::string16 ChromeToolbarModelDelegate::FormattedStringWithEquivalentMeaning(
     const GURL& url,
     const base::string16& formatted_url) const {
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
       url, formatted_url, ChromeAutocompleteSchemeClassifier(GetProfile()));
 }
@@ skipping 79 matching lines @@
   if (url.SchemeIs(content::kChromeUIScheme))
     return &toolbar::kProductIcon;
 
   if (url.SchemeIs(extensions::kExtensionScheme))
     return &omnibox::kExtensionAppIcon;
 #endif
 
   return nullptr;
 }
 
+bool ChromeToolbarModelDelegate::IsOfflinePage() const {
+#if defined(OS_ANDROID)
+  content::WebContents* web_contents = GetActiveWebContents();
+  if (!web_contents)
+    return false;
+  return offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
+             web_contents) != nullptr;

[Peter Kasting, 2017/07/06 06:08:07]

Nit: Simpler:

  return web_contents &&
         offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
             web_contents);

(Also, side remark... that name is unfortunate in its redundancy.  If we already
had a namespace for "offline_pages", then we presumably didn't need an
OfflinePageUtils class inside it at all, and if we did, it could have been
called just Utils, since "offline page" is implied by the enclosing namespace. 
Feel free to fix separately!)

+#else
+  return false;
+#endif
+}
+
 content::NavigationController*
 ChromeToolbarModelDelegate::GetNavigationController() const {
   // This |current_tab| can be null during the initialization of the toolbar
   // during window creation (i.e. before any tabs have been added to the
   // window).
   content::WebContents* current_tab = GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : nullptr;
 }
 
 content::NavigationEntry* ChromeToolbarModelDelegate::GetNavigationEntry()
     const {
   content::NavigationController* controller = GetNavigationController();
   return controller ? controller->GetVisibleEntry() : nullptr;
 }
 
 Profile* ChromeToolbarModelDelegate::GetProfile() const {
   content::NavigationController* controller = GetNavigationController();
   return controller
              ? Profile::FromBrowserContext(controller->GetBrowserContext())
              : nullptr;
 }