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 "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); | 245 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); |
246 menu_model_builder_->Init(); | 246 menu_model_builder_->Init(); |
247 } | 247 } |
248 return menu_model_builder_->menu_model(); | 248 return menu_model_builder_->menu_model(); |
249 } | 249 } |
250 | 250 |
251 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 251 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
252 return browser_frame_view_->avatar_button(); | 252 return browser_frame_view_->avatar_button(); |
253 } | 253 } |
254 | 254 |
| 255 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { |
| 256 return browser_frame_view_->new_avatar_button(); |
| 257 } |
| 258 |
255 #if !defined(OS_WIN) || defined(USE_AURA) | 259 #if !defined(OS_WIN) || defined(USE_AURA) |
256 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 260 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
257 return !IsMaximized(); | 261 return !IsMaximized(); |
258 } | 262 } |
259 #endif // OS_WIN | 263 #endif // OS_WIN |
OLD | NEW |