Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/plugins/plugin_observer.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/plugins/plugin_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 255 matching lines @@
   // When non-active tabs are restored they are not added in view/window parent
   // hierarchy (chrome::CreateRestoredTab/CreateParams). Normally we traverse
   // parent hierarchy to identify containing desktop (like in function
   // chrome::GetHostDesktopTypeForNativeView).
   // Possible issue with chrome::GetActiveDesktop, is that it's global
   // state, which remembers last active desktop, which may break in scenarios
   // where we have instances on both Ash and Native desktop.
 
   // We will do both tests. Both have some factor of unreliability.
   aura::Window* window = web_contents()->GetNativeView();
-  if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH ||
+  if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH ||
       chrome::GetHostDesktopTypeForNativeView(window) ==
-      chrome::HOST_DESKTOP_TYPE_ASH) {
+          ui::HOST_DESKTOP_TYPE_ASH) {
     int routing_id = render_frame_host->GetRoutingID();
     render_frame_host->Send(new ChromeViewMsg_NPAPINotSupported(routing_id));
   }
 #endif
 }
 
 void PluginObserver::PluginCrashed(const base::FilePath& plugin_path,
                                    base::ProcessId plugin_pid) {
   DCHECK(!plugin_path.value().empty());
 
@@ skipping 132 matching lines @@
   scoped_ptr<PluginMetadata> plugin;
   bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier(
       identifier, NULL, &plugin);
   DCHECK(ret);
 
   PluginMetroModeInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents()),
       PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name());
 #endif
 }