Straighten up includes of host_desktop.h/host_desktop_type.h

chrome/browser/ui/webui/ntp/new_tab_ui.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/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/metrics_handler.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h"
 #include "chrome/common/pref_names.h"
@@ skipping 10 matching lines @@
 #include "extensions/browser/extension_system.h"
 #include "grit/browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_handler.h"
 #endif
 
 #if defined(USE_ASH)
-#include "chrome/browser/ui/host_desktop.h"
+#include "ui/gfx/host_desktop_type.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebUIController;
 
 namespace {
 
 // The amount of time there must be no painting for us to consider painting
 // finished.  Observed times are in the ~1200ms range on Windows.
@@ skipping 282 matching lines @@
 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
                                              const char* mime_type,
                                              int resource_id) {
   DCHECK(resource);
   DCHECK(mime_type);
   resource_map_[std::string(resource)] =
       std::make_pair(std::string(mime_type), resource_id);
 }
 
 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}