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

chrome/browser/ui/browser_navigator.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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 622 matching lines @@
     DCHECK_GT(stripped_spec.size(), strlen(content::kViewSourceScheme));
     stripped_spec.erase(0, strlen(content::kViewSourceScheme) + 1);
     GURL stripped_url(stripped_spec);
     return stripped_url.is_valid() &&
         IsURLAllowedInIncognito(stripped_url, browser_context);
   }
   // Most URLs are allowed in incognito; the following are exceptions.
   // chrome://extensions is on the list because it redirects to
   // chrome://settings.
   if (url.scheme() == content::kChromeUIScheme &&
-      (url.host_piece() == chrome::kChromeUISettingsHost ||
+      (url.host_piece() == content::kChromeUISettingsHost ||
        url.host_piece() == chrome::kChromeUIMdSettingsHost ||
        url.host_piece() == chrome::kChromeUISettingsFrameHost ||
-       url.host_piece() == chrome::kChromeUIHelpHost ||
+       url.host_piece() == content::kChromeUIHelpHost ||
        url.host_piece() == content::kChromeUIHistoryHost ||
        url.host_piece() == chrome::kChromeUIExtensionsHost ||
        url.host_piece() == chrome::kChromeUIBookmarksHost ||
 #if !defined(OS_CHROMEOS)
        url.host_piece() == chrome::kChromeUIChromeSigninHost ||
 #endif
        url.host_piece() == chrome::kChromeUIUberHost ||
        url.host_piece() == chrome::kChromeUIThumbnailHost ||
        url.host_piece() == chrome::kChromeUIThumbnailHost2 ||
        url.host_piece() == chrome::kChromeUIThumbnailListHost ||
@@ skipping 17 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme_piece() == content::kChromeUIScheme &&
            rewritten_url.host_piece() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome