Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 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/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 449 matching lines @@
   if (ash::Shell::GetInstance()->display_manager()->num_connected_displays() >
       2) {
     return;
   }
   content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
   ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);
 }
 
 void SystemTrayDelegateChromeOS::ShowChromeSlow() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+      ProfileManager::GetPrimaryUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowSlow(displayer.browser());
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowDisplayNotification() {
   // Packaged app is not counted as 'last active', so if a browser opening the
   // display settings is in background of a packaged app, it will return true.
   // TODO(mukai): fix this.
   Browser* active_browser =
-      chrome::FindLastActiveWithHostDesktopType(chrome::HOST_DESKTOP_TYPE_ASH);
+      chrome::FindLastActiveWithHostDesktopType(ui::HOST_DESKTOP_TYPE_ASH);
   if (!active_browser)
     return true;
 
   content::WebContents* active_contents =
       active_browser->tab_strip_model()->GetActiveWebContents();
   if (!active_contents)
     return true;
 
   GURL visible_url = active_contents->GetLastCommittedURL();
   return !(chrome::IsSettingsSubPage(visible_url,
                                      kDisplaySettingsSubPageName) ||
            chrome::IsSettingsSubPage(visible_url,
                                      kDisplayOverscanSettingsSubPageName));
 }
 
 void SystemTrayDelegateChromeOS::ShowIMESettings() {
   content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
   ShowSettingsSubPageForActiveUser(chrome::kLanguageOptionsSubPage);
 }
 
 void SystemTrayDelegateChromeOS::ShowHelp() {
   chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(),
-                             chrome::HOST_DESKTOP_TYPE_ASH,
+                             ui::HOST_DESKTOP_TYPE_ASH,
                              chrome::HELP_SOURCE_MENU);
 }
 
 void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+      ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
   accessibility::ShowAccessibilityHelp(displayer.browser());
 }
 
 void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() {
   content::RecordAction(base::UserMetricsAction("ShowAccessibilitySettings"));
   std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
                          l10n_util::GetStringUTF8(
                              IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
   ShowSettingsSubPageForActiveUser(sub_page);
 }
 
 void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+      ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
   // TODO(antrim): find out what should we show in this case.
   // http://crbug.com/229762
 }
 
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
   ash::user::LoginStatus status = GetUserLoginStatus();
   bool userAddingRunning = ash::Shell::GetInstance()
                                ->session_state_delegate()
                                ->IsInSecondaryLoginScreen();
 
   if (status == ash::user::LOGGED_IN_NONE ||
       status == ash::user::LOGGED_IN_LOCKED || userAddingRunning) {
     scoped_refptr<chromeos::HelpAppLauncher> help_app(
         new chromeos::HelpAppLauncher(GetNativeWindow()));
     help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
   } else {
     chrome::ScopedTabbedBrowserDisplayer displayer(
-        ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+        ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
     chrome::ShowSingletonTab(displayer.browser(),
                              GURL(chrome::kLearnMoreEnterpriseURL));
   }
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   ash::Shell* shell = ash::Shell::GetInstance();
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return;
 
@@ skipping 475 matching lines @@
       user_profile_);
   if (service)
     service->RemoveObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::NotifyIfLastWindowClosed() {
   if (!user_profile_)
     return;
 
   BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end();
        ++it) {
     if ((*it)->profile()->IsSameProfile(user_profile_)) {
       // The current user has at least one open browser window.
       return;
     }
   }
 
   if (!extensions::AppWindowRegistry::Get(
@@ skipping 276 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos