chrome/browser/ui/cocoa/browser_window_factory.mm - Issue 697223003: MacViews: Get chrome/browser/ui/views/frame to compile

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/cocoa/browser_window_factory.mm

Issue 697223003: MacViews: Get chrome/browser/ui/views/frame to compile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@constrained

Patch Set: Rebase. Add mac_views_browser build flag Created 6 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/cocoa/browser_window_factory.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_factory.mm b/chrome/browser/ui/cocoa/browser_window_factory.mm

index 8a6214a3fc9710bd6a9c9de6b4e240e8448051db..6b53e6e2815ea9e836cccae73be0c86809713b6c 100644

--- a/chrome/browser/ui/cocoa/browser_window_factory.mm

+++ b/chrome/browser/ui/cocoa/browser_window_factory.mm

@@ -7,6 +7,7 @@

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

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

+#if !defined(MAC_VIEWS_BROWSER)

tapted 2014/11/04 02:33:42 I think it's more conventional to exclude the enti

Andre 2014/11/05 02:04:22 Done.

// Create the controller for the Browser, which handles loading the browser

// window from the nib. The controller takes ownership of |browser|.

// static

@@ -21,3 +22,4 @@ chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(

chrome::HostDesktopType desktop_type) {

return desktop_type;

}

+#endif

« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/ui/views/frame/browser_command_handler_x11.cc » ('j') | chrome/browser/ui/views/frame/browser_frame.cc » ('J')