OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/browser.h" | 6 #include "chrome/browser/browser.h" |
7 #include "chrome/browser/browser_process.h" // TODO(beng): remove once done. | 7 #include "chrome/browser/browser_process.h" // TODO(beng): remove once done. |
8 #include "chrome/browser/browser_window.h" | 8 #include "chrome/browser/browser_window.h" |
9 #include "chrome/browser/frame_util.h" | 9 #include "chrome/browser/frame_util.h" |
10 #include "chrome/browser/views/frame/aero_glass_frame.h" | 10 #include "chrome/browser/views/frame/aero_glass_frame.h" |
11 #include "chrome/browser/views/frame/browser_frame.h" | 11 #include "chrome/browser/views/frame/browser_frame.h" |
12 #include "chrome/browser/views/frame/browser_view.h" | 12 #include "chrome/browser/views/frame/browser_view.h" |
13 #include "chrome/browser/views/frame/opaque_frame.h" | 13 #include "chrome/browser/views/frame/opaque_frame.h" |
14 #include "chrome/common/win_util.h" | 14 #include "chrome/common/win_util.h" |
15 | 15 |
16 /////////////////////////////////////////////////////////////////////////////// | 16 /////////////////////////////////////////////////////////////////////////////// |
17 // BrowserWindow, public: | 17 // BrowserWindow, public: |
18 | 18 |
19 // static | 19 // static |
20 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser, | 20 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
21 const gfx::Rect& bounds, | |
22 int show_command) { | |
23 BrowserView* browser_view = new BrowserView(browser); | 21 BrowserView* browser_view = new BrowserView(browser); |
24 BrowserFrame::CreateForBrowserView(BrowserFrame::GetActiveFrameType(), | 22 BrowserFrame::CreateForBrowserView(BrowserFrame::GetActiveFrameType(), |
25 browser_view, bounds, show_command); | 23 browser_view); |
26 return browser_view; | 24 return browser_view; |
27 } | 25 } |
28 | 26 |
29 /////////////////////////////////////////////////////////////////////////////// | 27 /////////////////////////////////////////////////////////////////////////////// |
30 // BrowserFrame, public: | 28 // BrowserFrame, public: |
31 | 29 |
32 // static | 30 // static |
33 BrowserFrame::FrameType BrowserFrame::GetActiveFrameType() { | 31 BrowserFrame::FrameType BrowserFrame::GetActiveFrameType() { |
34 return win_util::ShouldUseVistaFrame() ? BrowserFrame::FRAMETYPE_AERO_GLASS | 32 return win_util::ShouldUseVistaFrame() ? BrowserFrame::FRAMETYPE_AERO_GLASS |
35 : BrowserFrame::FRAMETYPE_OPAQUE; | 33 : BrowserFrame::FRAMETYPE_OPAQUE; |
36 } | 34 } |
37 | 35 |
38 // static | 36 // static |
39 BrowserFrame* BrowserFrame::CreateForBrowserView(BrowserFrame::FrameType type, | 37 BrowserFrame* BrowserFrame::CreateForBrowserView(BrowserFrame::FrameType type, |
40 BrowserView* browser_view, | 38 BrowserView* browser_view) { |
41 const gfx::Rect& bounds, | |
42 int show_command) { | |
43 if (type == FRAMETYPE_OPAQUE) { | 39 if (type == FRAMETYPE_OPAQUE) { |
44 OpaqueFrame* frame = new OpaqueFrame(browser_view); | 40 OpaqueFrame* frame = new OpaqueFrame(browser_view); |
45 frame->Init(NULL, bounds); | 41 frame->Init(); |
46 return frame; | 42 return frame; |
47 } else if (type == FRAMETYPE_AERO_GLASS) { | 43 } else if (type == FRAMETYPE_AERO_GLASS) { |
48 AeroGlassFrame* frame = new AeroGlassFrame(browser_view); | 44 AeroGlassFrame* frame = new AeroGlassFrame(browser_view); |
49 frame->Init(bounds); | 45 frame->Init(); |
50 return frame; | 46 return frame; |
51 } | 47 } |
52 NOTREACHED() << "Unsupported frame type"; | 48 NOTREACHED() << "Unsupported frame type"; |
53 return NULL; | 49 return NULL; |
54 } | 50 } |
55 | 51 |
OLD | NEW |