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