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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | Download patch

« 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')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "chrome/browser/ui/cocoa/browser_window_controller.h"	6 #include "chrome/browser/ui/cocoa/browser_window_controller.h"

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

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

9	9

	10 #if !defined(MAC_VIEWS_BROWSER)
	tapted 2014/11/04 02:33:42 I think it's more conventional to exclude the enti I think it's more conventional to exclude the entire file at the gyp/gn level Andre 2014/11/05 02:04:22 Done. Show quoted text On 2014/11/04 02:33:42, tapted wrote: > I think it's more conventional to exclude the entire file at the gyp/gn level Done.
10 // Create the controller for the Browser, which handles loading the browser	11 // Create the controller for the Browser, which handles loading the browser

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

12 // static	13 // static

13 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {	14 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {

14 BrowserWindowController* controller =	15 BrowserWindowController* controller =

15 [[BrowserWindowController alloc] initWithBrowser:browser];	16 [[BrowserWindowController alloc] initWithBrowser:browser];

16 return [controller browserWindow];	17 return [controller browserWindow];

17 }	18 }

18	19

19 // static	20 // static

20 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(	21 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(

21 chrome::HostDesktopType desktop_type) {	22 chrome::HostDesktopType desktop_type) {

22 return desktop_type;	23 return desktop_type;

23 }	24 }

	25 #endif

OLD	NEW