| 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 "chrome/browser/views/frame/opaque_frame.h" | 5 #include "chrome/browser/views/frame/opaque_frame.h" |
| 6 | 6 |
| 7 #include "chrome/browser/frame_util.h" | 7 #include "chrome/browser/frame_util.h" |
| 8 #include "chrome/browser/views/frame/browser_view.h" | 8 #include "chrome/browser/views/frame/browser_view.h" |
| 9 #include "chrome/browser/views/frame/opaque_non_client_view.h" | 9 #include "chrome/browser/views/frame/opaque_non_client_view.h" |
| 10 #include "chrome/browser/views/tabs/tab_strip.h" | 10 #include "chrome/browser/views/tabs/tab_strip.h" |
| 11 #include "chrome/views/window_delegate.h" | 11 #include "chrome/views/window_delegate.h" |
| 12 | 12 |
| 13 /////////////////////////////////////////////////////////////////////////////// | 13 /////////////////////////////////////////////////////////////////////////////// |
| 14 // OpaqueFrame, public: | 14 // OpaqueFrame, public: |
| 15 | 15 |
| 16 OpaqueFrame::OpaqueFrame(BrowserView* browser_view) | 16 OpaqueFrame::OpaqueFrame(BrowserView* browser_view) |
| 17 : CustomFrameWindow(browser_view, new OpaqueNonClientView(this, | 17 : CustomFrameWindow(browser_view, new OpaqueNonClientView(this, |
| 18 browser_view)), | 18 browser_view)), |
| 19 browser_view_(browser_view) { | 19 browser_view_(browser_view) { |
| 20 browser_view_->set_frame(this); | 20 browser_view_->set_frame(this); |
| 21 } | 21 } |
| 22 | 22 |
| 23 OpaqueFrame::~OpaqueFrame() { | 23 OpaqueFrame::~OpaqueFrame() { |
| 24 } | 24 } |
| 25 | 25 |
| 26 void OpaqueFrame::Init() { |
| 27 CustomFrameWindow::Init(NULL, gfx::Rect()); |
| 28 } |
| 29 |
| 26 /////////////////////////////////////////////////////////////////////////////// | 30 /////////////////////////////////////////////////////////////////////////////// |
| 27 // OpaqueFrame, BrowserFrame implementation: | 31 // OpaqueFrame, BrowserFrame implementation: |
| 28 | 32 |
| 29 gfx::Rect OpaqueFrame::GetWindowBoundsForClientBounds( | 33 gfx::Rect OpaqueFrame::GetWindowBoundsForClientBounds( |
| 30 const gfx::Rect& client_bounds) { | 34 const gfx::Rect& client_bounds) { |
| 31 return GetOpaqueNonClientView()->GetWindowBoundsForClientBounds( | 35 return GetOpaqueNonClientView()->GetWindowBoundsForClientBounds( |
| 32 client_bounds); | 36 client_bounds); |
| 33 } | 37 } |
| 34 | 38 |
| 35 void OpaqueFrame::SizeToContents(const gfx::Rect& contents_bounds) { | 39 void OpaqueFrame::SizeToContents(const gfx::Rect& contents_bounds) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 55 } | 59 } |
| 56 | 60 |
| 57 /////////////////////////////////////////////////////////////////////////////// | 61 /////////////////////////////////////////////////////////////////////////////// |
| 58 // OpaqueFrame, views::CustomFrameWindow overrides: | 62 // OpaqueFrame, views::CustomFrameWindow overrides: |
| 59 | 63 |
| 60 void OpaqueFrame::UpdateWindowIcon() { | 64 void OpaqueFrame::UpdateWindowIcon() { |
| 61 CustomFrameWindow::UpdateWindowIcon(); | 65 CustomFrameWindow::UpdateWindowIcon(); |
| 62 GetOpaqueNonClientView()->UpdateWindowIcon(); | 66 GetOpaqueNonClientView()->UpdateWindowIcon(); |
| 63 } | 67 } |
| 64 | 68 |
| 69 int OpaqueFrame::GetShowState() const { |
| 70 return browser_view_->GetShowState(); |
| 71 } |
| 72 |
| 65 /////////////////////////////////////////////////////////////////////////////// | 73 /////////////////////////////////////////////////////////////////////////////// |
| 66 // OpaqueFrame, views::ContainerWin overrides: | 74 // OpaqueFrame, views::ContainerWin overrides: |
| 67 | 75 |
| 68 bool OpaqueFrame::AcceleratorPressed(views::Accelerator* accelerator) { | 76 bool OpaqueFrame::AcceleratorPressed(views::Accelerator* accelerator) { |
| 69 return browser_view_->AcceleratorPressed(*accelerator); | 77 return browser_view_->AcceleratorPressed(*accelerator); |
| 70 } | 78 } |
| 71 | 79 |
| 72 bool OpaqueFrame::GetAccelerator(int cmd_id, views::Accelerator* accelerator) { | 80 bool OpaqueFrame::GetAccelerator(int cmd_id, views::Accelerator* accelerator) { |
| 73 return browser_view_->GetAccelerator(cmd_id, accelerator); | 81 return browser_view_->GetAccelerator(cmd_id, accelerator); |
| 74 } | 82 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 } | 122 } |
| 115 | 123 |
| 116 /////////////////////////////////////////////////////////////////////////////// | 124 /////////////////////////////////////////////////////////////////////////////// |
| 117 // OpaqueFrame, private: | 125 // OpaqueFrame, private: |
| 118 | 126 |
| 119 OpaqueNonClientView* OpaqueFrame::GetOpaqueNonClientView() const { | 127 OpaqueNonClientView* OpaqueFrame::GetOpaqueNonClientView() const { |
| 120 // We can safely assume that this conversion is true. | 128 // We can safely assume that this conversion is true. |
| 121 return static_cast<OpaqueNonClientView*>(non_client_view_); | 129 return static_cast<OpaqueNonClientView*>(non_client_view_); |
| 122 } | 130 } |
| 123 | 131 |
| OLD | NEW |