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

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

Issue 1972033002: Simplify some old avatar menu button code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinstate ash browser test fix Created 4 years, 7 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 <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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } 265 }
266 #endif 266 #endif
267 if (!menu_model_builder_.get()) { 267 if (!menu_model_builder_.get()) {
268 menu_model_builder_.reset( 268 menu_model_builder_.reset(
269 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); 269 new SystemMenuModelBuilder(browser_view_, browser_view_->browser()));
270 menu_model_builder_->Init(); 270 menu_model_builder_->Init();
271 } 271 }
272 return menu_model_builder_->menu_model(); 272 return menu_model_builder_->menu_model();
273 } 273 }
274 274
275 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
276 return browser_frame_view_->avatar_button();
277 }
278
279 views::View* BrowserFrame::GetNewAvatarMenuButton() { 275 views::View* BrowserFrame::GetNewAvatarMenuButton() {
280 return browser_frame_view_->GetProfileSwitcherView(); 276 return browser_frame_view_->GetProfileSwitcherView();
281 } 277 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698