| 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/debug/leak_annotations.h" | 9 #include "base/debug/leak_annotations.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 menu_model_builder_->Init(); | 257 menu_model_builder_->Init(); |
| 258 } | 258 } |
| 259 return menu_model_builder_->menu_model(); | 259 return menu_model_builder_->menu_model(); |
| 260 } | 260 } |
| 261 | 261 |
| 262 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 262 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 263 return browser_frame_view_->avatar_button(); | 263 return browser_frame_view_->avatar_button(); |
| 264 } | 264 } |
| 265 | 265 |
| 266 #if defined(FRAME_AVATAR_BUTTON) | 266 #if defined(FRAME_AVATAR_BUTTON) |
| 267 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { | 267 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
| 268 return browser_frame_view_->new_avatar_button(); | 268 return browser_frame_view_->new_avatar_button(); |
| 269 } | 269 } |
| 270 #endif | 270 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1608843002:
Start untangling the avatar switcher from BrowserNonClientFrameView (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@20160119-MacViewsBrowser-Compile