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

Unified Diff: chrome/browser/plugins/plugin_observer.cc

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/plugins/plugin_observer.cc
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index 21b5df704f9273a957ba24b0da44724ca83994b6..0237b7316387a82c30f12680105cdc90f3bbd14d 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -273,9 +273,9 @@ void PluginObserver::RenderFrameCreated(
// 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));
}

Powered by Google App Engine
This is Rietveld 408576698