MD Settings: enhance restarting Chrome + interacting w/ session restore

chrome/browser/custom_home_pages_table_model.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/custom_home_pages_table_model.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Checks whether the given URL should count as one of the "current" pages.
 // Returns true for all pages except dev tools and settings.
 bool ShouldAddPage(const GURL& url) {
   if (url.is_empty())
     return false;
 
   if (url.SchemeIs(content::kChromeDevToolsScheme))
     return false;
 
   if (url.SchemeIs(content::kChromeUIScheme)) {
-    if (url.host_piece() == chrome::kChromeUISettingsHost ||
+    if (url.host_piece() == content::kChromeUISettingsHost ||
         url.host_piece() == chrome::kChromeUISettingsFrameHost) {
       return false;
     }
 
     // For a settings page, the path will start with "/settings" not "settings"
     // so find() will return 1, not 0.
     if (url.host_piece() == chrome::kChromeUIUberHost &&
-        url.path_piece().find(chrome::kChromeUISettingsHost) == 1) {
+        url.path_piece().find(content::kChromeUISettingsHost) == 1) {
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace
 
 struct CustomHomePagesTableModel::Entry {
@@ skipping 253 matching lines @@
     if (observer_ && observable)
       observer_->OnItemsChanged(static_cast<int>(entry_index), 1);
   }
 }
 
 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const {
   base::string16 url = url_formatter::FormatUrl(entries_[row].url);
   url = base::i18n::GetDisplayStringInLTRDirectionality(url);
   return url;
 }