chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc - Issue 58853004: [win8] Force browsers created with Chrome in Metro mode to be on the Ash desktop.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.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

« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc

diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc

similarity index 59%

rename from chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc

rename to chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc

index 36ae1b354781ceed402657ff32ed422595231423..27e65e82f25e4d72b60697143bbc91961633256a 100644

--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc

+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc

@@ -4,33 +4,18 @@

#include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"

-#include "chrome/browser/ui/browser.h"

-#include "chrome/browser/ui/views/frame/browser_view.h"

+#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"

#if defined(USE_ASH)

-#include "ash/wm/window_util.h"

-#include "chrome/browser/ui/ash/ash_init.h"

#include "chrome/browser/ui/views/frame/browser_frame_ash.h"

#endif

-#if !defined(OS_CHROMEOS)

-#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"

-#endif

NativeBrowserFrame* NativeBrowserFrameFactory::Create(

BrowserFrame* browser_frame,

BrowserView* browser_view) {

-#if defined(OS_CHROMEOS)

- return new BrowserFrameAsh(browser_frame, browser_view);

-#else

#if defined(USE_ASH)

- if (chrome::ShouldOpenAshOnStartup() ||

- browser_view->browser()->

- host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {

+ if (ShouldCreateForAshDesktop(browser_view))

return new BrowserFrameAsh(browser_frame, browser_view);

- }

-#endif // USE_ASH

- return new DesktopBrowserFrameAura(browser_frame, browser_view);

#endif

+ return new DesktopBrowserFrameAura(browser_frame, browser_view);

}