| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 274 } |
| 275 #endif | 275 #endif |
| 276 if (!menu_model_builder_.get()) { | 276 if (!menu_model_builder_.get()) { |
| 277 menu_model_builder_.reset( | 277 menu_model_builder_.reset( |
| 278 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); | 278 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); |
| 279 menu_model_builder_->Init(); | 279 menu_model_builder_->Init(); |
| 280 } | 280 } |
| 281 return menu_model_builder_->menu_model(); | 281 return menu_model_builder_->menu_model(); |
| 282 } | 282 } |
| 283 | 283 |
| 284 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 284 views::MenuButton* BrowserFrame::GetNewAvatarMenuButton() { |
| 285 return browser_frame_view_->GetProfileSwitcherView(); | 285 return browser_frame_view_->GetProfileSwitcherButton(); |
| 286 } | 286 } |
| 287 | 287 |
| 288 void BrowserFrame::OnMenuClosed() { | 288 void BrowserFrame::OnMenuClosed() { |
| 289 menu_runner_.reset(); | 289 menu_runner_.reset(); |
| 290 } | 290 } |
| OLD | NEW |