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

Unified Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

Issue 58853004: [win8] Force browsers created with Chrome in Metro mode to be on the Ash desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move from browser_commands to BrowserWindow Created 7 years, 1 month 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/views/frame/native_browser_frame_factory_aurawin.cc
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc
new file mode 100644
index 0000000000000000000000000000000000000000..762ee72a62958315b038ed66919eedcc6be71b4a
--- /dev/null
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc
@@ -0,0 +1,33 @@
+// 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/views/frame/native_browser_frame_factory.h"
+
+#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
+
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#include "chrome/browser/ui/views/frame/browser_frame_ashwin.h"
+#endif
+
+NativeBrowserFrame* NativeBrowserFrameFactory::Create(
+ BrowserFrame* browser_frame,
+ BrowserView* browser_view) {
+#if defined(USE_ASH)
+ if (ShouldCreateForAshDesktop(browser_view))
+ return new BrowserFrameAshWin(browser_frame, browser_view);
+#endif
+ return new DesktopBrowserFrameAura(browser_frame, browser_view);
+}
+
+// static
+chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType(
+ chrome::HostDesktopType desktop_type) {
+#if defined(USE_ASH)
+ if (ash::Shell::HasInstance())
+ return chrome::HOST_DESKTOP_TYPE_ASH;
+#endif
+
+ return desktop_type;
+}

Powered by Google App Engine
This is Rietveld 408576698