Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: chrome/browser/ui/host_desktop.h

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/host_desktop.h
diff --git a/chrome/browser/ui/host_desktop.h b/chrome/browser/ui/host_desktop.h
index 972845445076329460257baf90866b80ac733df0..9ff6c1af0a64c77b8ffea903b00ceac97bb6452b 100644
--- a/chrome/browser/ui/host_desktop.h
+++ b/chrome/browser/ui/host_desktop.h
@@ -5,43 +5,24 @@
#ifndef CHROME_BROWSER_UI_HOST_DESKTOP_H_
#define CHROME_BROWSER_UI_HOST_DESKTOP_H_
+#include "ui/gfx/host_desktop_type.h"
#include "ui/gfx/native_widget_types.h"
class Browser;
namespace chrome {
-// A value that specifies what desktop environment hosts a particular piece of
-// UI. You should almost never manually hardcode one of these enums manually,
-// please refer to the following document for details on getting the right
-// HostDesktopType:
-// http://sites.google.com/a/chromium.org/dev/developers/design-documents/aura/multi-desktop
-enum HostDesktopType {
- HOST_DESKTOP_TYPE_FIRST = 0,
-
- // The UI is hosted on the system native desktop.
- HOST_DESKTOP_TYPE_NATIVE = HOST_DESKTOP_TYPE_FIRST,
-
- // The UI is hosted in the synthetic Ash desktop.
-#if defined(OS_CHROMEOS)
- HOST_DESKTOP_TYPE_ASH = HOST_DESKTOP_TYPE_NATIVE,
-#else
- HOST_DESKTOP_TYPE_ASH,
-#endif
-
- HOST_DESKTOP_TYPE_COUNT
-};
-
-HostDesktopType GetHostDesktopTypeForNativeView(gfx::NativeView native_view);
-HostDesktopType GetHostDesktopTypeForNativeWindow(
+ui::HostDesktopType GetHostDesktopTypeForNativeView(
+ gfx::NativeView native_view);
+ui::HostDesktopType GetHostDesktopTypeForNativeWindow(
gfx::NativeWindow native_window);
// Returns the type of host desktop most likely to be in use. This is the one
// most recently activated by the user.
// You should almost never use this outside of tests, please refer to the
-// following document for details on getting the right HostDesktopType:
+// following document for details on getting the right ui::HostDesktopType:
// http://sites.google.com/a/chromium.org/dev/developers/design-documents/aura/multi-desktop
-HostDesktopType GetActiveDesktop();
+ui::HostDesktopType GetActiveDesktop();
} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698