| 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" | |
| 6 #include "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 7 #include "chrome/browser/ui/browser_window.h" | 6 #include "chrome/browser/ui/browser_window.h" |
| 8 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 7 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 9 | 8 |
| 10 // Create the controller for the Browser, which handles loading the browser | 9 // Create the controller for the Browser, which handles loading the browser |
| 11 // window from the nib. The controller takes ownership of |browser|. | 10 // window from the nib. The controller takes ownership of |browser|. |
| 12 // static | 11 // static |
| 13 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 12 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 14 BrowserWindowController* controller = | 13 BrowserWindowController* controller = |
| 15 [[BrowserWindowController alloc] initWithBrowser:browser]; | 14 [[BrowserWindowController alloc] initWithBrowser:browser]; |
| 16 return [controller browserWindow]; | 15 return [controller browserWindow]; |
| 17 } | 16 } |
| 18 | 17 |
| 19 // static | 18 // static |
| 20 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType( | 19 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType( |
| 21 chrome::HostDesktopType desktop_type) { | 20 chrome::HostDesktopType desktop_type) { |
| 22 return desktop_type; | 21 return desktop_type; |
| 23 } | 22 } |
| OLD | NEW |