| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 } | 259 } |
| 260 } | 260 } |
| 261 } | 261 } |
| 262 | 262 |
| 263 ui::MenuModel* BrowserFrame::GetSystemMenuModel() { | 263 ui::MenuModel* BrowserFrame::GetSystemMenuModel() { |
| 264 #if defined(OS_CHROMEOS) | 264 #if defined(OS_CHROMEOS) |
| 265 ash::SessionStateDelegate* delegate = | 265 ash::SessionStateDelegate* delegate = |
| 266 ash::WmShell::Get()->GetSessionStateDelegate(); | 266 ash::WmShell::Get()->GetSessionStateDelegate(); |
| 267 if (delegate && delegate->NumberOfLoggedInUsers() > 1) { | 267 if (delegate && delegate->NumberOfLoggedInUsers() > 1) { |
| 268 // In Multi user mode, the number of users as well as the order of users | 268 // In Multi user mode, the number of users as well as the order of users |
| 269 // can change. Coming here we have more then one user and since the menu | 269 // can change. Coming here we have more than one user and since the menu |
| 270 // model contains the user information, it must get updated to show any | 270 // model contains the user information, it must get updated to show any |
| 271 // changes happened since the last invocation. | 271 // changes happened since the last invocation. |
| 272 menu_model_builder_.reset(); | 272 menu_model_builder_.reset(); |
| 273 } | 273 } |
| 274 #endif | 274 #endif |
| 275 if (!menu_model_builder_.get()) { | 275 if (!menu_model_builder_.get()) { |
| 276 menu_model_builder_.reset( | 276 menu_model_builder_.reset( |
| 277 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); | 277 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); |
| 278 menu_model_builder_->Init(); | 278 menu_model_builder_->Init(); |
| 279 } | 279 } |
| 280 return menu_model_builder_->menu_model(); | 280 return menu_model_builder_->menu_model(); |
| 281 } | 281 } |
| 282 | 282 |
| 283 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 283 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
| 284 return browser_frame_view_->GetProfileSwitcherView(); | 284 return browser_frame_view_->GetProfileSwitcherView(); |
| 285 } | 285 } |
| OLD | NEW |