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

chrome/browser/ui/views/frame/system_menu_model_builder.cc

 // Copyright (c) 2013 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/views/frame/system_menu_model_builder.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
+#include "content/public/common/url_constants.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/models/simple_menu_model.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
 namespace {
 
 // Given a |browser| that's an app or popup window, checks if it's hosting the
 // settings page.
 bool IsChromeSettingsAppOrPopupWindow(Browser* browser) {
   DCHECK(browser);
   TabStripModel* tab_strip = browser->tab_strip_model();
   DCHECK_EQ(1, tab_strip->count());
   const GURL gurl(tab_strip->GetWebContentsAt(0)->GetURL());
   if (gurl.SchemeIs(content::kChromeUIScheme) &&
-      gurl.host().find(chrome::kChromeUISettingsHost) != std::string::npos) {
+      gurl.host().find(content::kChromeUISettingsHost) != std::string::npos) {
     return true;
   }
   return false;
 }
 
 }  // namespace
 
 SystemMenuModelBuilder::SystemMenuModelBuilder(
     ui::AcceleratorProvider* provider,
     Browser* browser)
@@ skipping 126 matching lines @@
     const user_manager::UserInfo* user_info = logged_in_users[user_index];
     model->AddItem(
         user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2
                         : IDC_VISIT_DESKTOP_OF_LRU_USER_3,
         l10n_util::GetStringFUTF16(
             IDS_VISIT_DESKTOP_OF_LRU_USER, user_info->GetDisplayName(),
             base::ASCIIToUTF16(user_info->GetDisplayEmail())));
   }
 #endif
 }