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

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

Issue 869793004: Bring up the Fast User Switcher on Shift+Click on the new Avatar Button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to right click and port to Mac UI Created 5 years, 10 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/opaque_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 const ui::Event& event) { 320 const ui::Event& event) {
321 if (sender == minimize_button_) { 321 if (sender == minimize_button_) {
322 frame()->Minimize(); 322 frame()->Minimize();
323 } else if (sender == maximize_button_) { 323 } else if (sender == maximize_button_) {
324 frame()->Maximize(); 324 frame()->Maximize();
325 } else if (sender == restore_button_) { 325 } else if (sender == restore_button_) {
326 frame()->Restore(); 326 frame()->Restore();
327 } else if (sender == close_button_) { 327 } else if (sender == close_button_) {
328 frame()->Close(); 328 frame()->Close();
329 } else if (sender == new_avatar_button()) { 329 } else if (sender == new_avatar_button()) {
330 browser_view()->ShowAvatarBubbleFromAvatarButton( 330 BrowserWindow::AvatarBubbleMode mode =
331 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, 331 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT;
332 if (!switches::IsFastUserSwitching()) {
333 if (event.IsMouseEvent() &&
334 static_cast<const ui::MouseEvent&>(event).IsLeftMouseButton()){
Roger Tawa OOO till Jul 10th 2015/01/29 23:00:35 Space before {
anthonyvd 2015/01/30 15:02:20 Done.
335 browser_view()->ShowAvatarBubbleFromAvatarButton(
336 mode,
337 signin::ManageAccountsParams());
338 }
339 } else {
340 if (event.IsMouseEvent() &&
341 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) {
342 mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH;
343 }
344 browser_view()->ShowAvatarBubbleFromAvatarButton(
345 mode,
332 signin::ManageAccountsParams()); 346 signin::ManageAccountsParams());
347 }
333 } 348 }
334 } 349 }
335 350
336 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, 351 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
337 const gfx::Point& point) { 352 const gfx::Point& point) {
338 #if defined(OS_LINUX) 353 #if defined(OS_LINUX)
339 views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), 354 views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
340 views::MenuRunner::HAS_MNEMONICS); 355 views::MenuRunner::HAS_MNEMONICS);
341 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), 356 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
342 window_icon_, 357 window_icon_,
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 937
923 int OpaqueBrowserFrameView::GetTopAreaHeight() const { 938 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
924 gfx::ImageSkia* frame_image = GetFrameImage(); 939 gfx::ImageSkia* frame_image = GetFrameImage();
925 int top_area_height = frame_image->height(); 940 int top_area_height = frame_image->height();
926 if (browser_view()->IsTabStripVisible()) { 941 if (browser_view()->IsTabStripVisible()) {
927 top_area_height = std::max(top_area_height, 942 top_area_height = std::max(top_area_height,
928 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); 943 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
929 } 944 }
930 return top_area_height; 945 return top_area_height;
931 } 946 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698