| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 } | 118 } |
| 119 | 119 |
| 120 int BrowserFrame::GetThemeBackgroundXInset() const { | 120 int BrowserFrame::GetThemeBackgroundXInset() const { |
| 121 return browser_frame_view_->GetThemeBackgroundXInset(); | 121 return browser_frame_view_->GetThemeBackgroundXInset(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 void BrowserFrame::UpdateThrobber(bool running) { | 124 void BrowserFrame::UpdateThrobber(bool running) { |
| 125 browser_frame_view_->UpdateThrobber(running); | 125 browser_frame_view_->UpdateThrobber(running); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void BrowserFrame::UpdateToolbar() { | |
| 129 browser_frame_view_->UpdateToolbar(); | |
| 130 } | |
| 131 | |
| 132 views::View* BrowserFrame::GetLocationIconView() const { | |
| 133 return browser_frame_view_->GetLocationIconView(); | |
| 134 } | |
| 135 | |
| 136 BrowserNonClientFrameView* BrowserFrame::GetFrameView() const { | 128 BrowserNonClientFrameView* BrowserFrame::GetFrameView() const { |
| 137 return browser_frame_view_; | 129 return browser_frame_view_; |
| 138 } | 130 } |
| 139 | 131 |
| 140 bool BrowserFrame::UseCustomFrame() const { | 132 bool BrowserFrame::UseCustomFrame() const { |
| 141 return native_browser_frame_->UseCustomFrame(); | 133 return native_browser_frame_->UseCustomFrame(); |
| 142 } | 134 } |
| 143 | 135 |
| 144 bool BrowserFrame::ShouldSaveWindowPlacement() const { | 136 bool BrowserFrame::ShouldSaveWindowPlacement() const { |
| 145 return native_browser_frame_->ShouldSaveWindowPlacement(); | 137 return native_browser_frame_->ShouldSaveWindowPlacement(); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 return menu_model_builder_->menu_model(); | 275 return menu_model_builder_->menu_model(); |
| 284 } | 276 } |
| 285 | 277 |
| 286 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 278 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
| 287 return browser_frame_view_->GetProfileSwitcherView(); | 279 return browser_frame_view_->GetProfileSwitcherView(); |
| 288 } | 280 } |
| 289 | 281 |
| 290 void BrowserFrame::OnMenuClosed() { | 282 void BrowserFrame::OnMenuClosed() { |
| 291 menu_runner_.reset(); | 283 menu_runner_.reset(); |
| 292 } | 284 } |
| OLD | NEW |