OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/frame/browser_frame.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 | 99 |
100 #if defined(OS_LINUX) | 100 #if defined(OS_LINUX) |
101 browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); | 101 browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); |
102 #endif | 102 #endif |
103 } | 103 } |
104 | 104 |
105 int BrowserFrame::GetMinimizeButtonOffset() const { | 105 int BrowserFrame::GetMinimizeButtonOffset() const { |
106 return native_browser_frame_->GetMinimizeButtonOffset(); | 106 return native_browser_frame_->GetMinimizeButtonOffset(); |
107 } | 107 } |
108 | 108 |
| 109 int BrowserFrame::GetMinimizeButtonHeight() const { |
| 110 return native_browser_frame_->GetMinimizeButtonHeight(); |
| 111 } |
| 112 |
109 gfx::Rect BrowserFrame::GetBoundsForTabStrip(views::View* tabstrip) const { | 113 gfx::Rect BrowserFrame::GetBoundsForTabStrip(views::View* tabstrip) const { |
110 // This can be invoked before |browser_frame_view_| has been set. | 114 // This can be invoked before |browser_frame_view_| has been set. |
111 return browser_frame_view_ ? | 115 return browser_frame_view_ ? |
112 browser_frame_view_->GetBoundsForTabStrip(tabstrip) : gfx::Rect(); | 116 browser_frame_view_->GetBoundsForTabStrip(tabstrip) : gfx::Rect(); |
113 } | 117 } |
114 | 118 |
115 int BrowserFrame::GetTopInset(bool restored) const { | 119 int BrowserFrame::GetTopInset(bool restored) const { |
116 return browser_frame_view_->GetTopInset(restored); | 120 return browser_frame_view_->GetTopInset(restored); |
117 } | 121 } |
118 | 122 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 } | 275 } |
272 #endif | 276 #endif |
273 if (!menu_model_builder_.get()) { | 277 if (!menu_model_builder_.get()) { |
274 menu_model_builder_.reset( | 278 menu_model_builder_.reset( |
275 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); | 279 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); |
276 menu_model_builder_->Init(); | 280 menu_model_builder_->Init(); |
277 } | 281 } |
278 return menu_model_builder_->menu_model(); | 282 return menu_model_builder_->menu_model(); |
279 } | 283 } |
280 | 284 |
281 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 285 views::MenuButton* BrowserFrame::GetNewAvatarMenuButton() { |
282 return browser_frame_view_->GetProfileSwitcherView(); | 286 return browser_frame_view_->GetProfileSwitcherButton(); |
283 } | 287 } |
284 | 288 |
285 void BrowserFrame::OnMenuClosed() { | 289 void BrowserFrame::OnMenuClosed() { |
286 menu_runner_.reset(); | 290 menu_runner_.reset(); |
287 } | 291 } |
OLD | NEW |