Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 24647003: Redesign of the avatar menu button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unbork test Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); 232 new SystemMenuModelBuilder(browser_view_, browser_view_->browser()));
233 menu_model_builder_->Init(); 233 menu_model_builder_->Init();
234 } 234 }
235 return menu_model_builder_->menu_model(); 235 return menu_model_builder_->menu_model();
236 } 236 }
237 237
238 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { 238 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
239 return browser_frame_view_->avatar_button(); 239 return browser_frame_view_->avatar_button();
240 } 240 }
241 241
242 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
243 return browser_frame_view_->new_avatar_button();
244 }
245
242 #if !defined(OS_WIN) || defined(USE_AURA) 246 #if !defined(OS_WIN) || defined(USE_AURA)
243 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { 247 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
244 return !IsMaximized(); 248 return !IsMaximized();
245 } 249 }
246 #endif // OS_WIN 250 #endif // OS_WIN
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698