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/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 Loading... |
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 DCHECK(event.IsMouseEvent()); |
331 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, | 331 bool isRightClick = |
332 signin::ManageAccountsParams()); | 332 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton(); |
| 333 |
| 334 BrowserWindow::AvatarBubbleMode mode = isRightClick ? |
| 335 BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH : |
| 336 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT; |
| 337 |
| 338 if (switches::IsFastUserSwitching() || !isRightClick) { |
| 339 browser_view()->ShowAvatarBubbleFromAvatarButton( |
| 340 mode, |
| 341 signin::ManageAccountsParams()); |
| 342 } |
333 } | 343 } |
334 } | 344 } |
335 | 345 |
336 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, | 346 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, |
337 const gfx::Point& point) { | 347 const gfx::Point& point) { |
338 #if defined(OS_LINUX) | 348 #if defined(OS_LINUX) |
339 views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), | 349 views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), |
340 views::MenuRunner::HAS_MNEMONICS); | 350 views::MenuRunner::HAS_MNEMONICS); |
341 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), | 351 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), |
342 window_icon_, | 352 window_icon_, |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
922 | 932 |
923 int OpaqueBrowserFrameView::GetTopAreaHeight() const { | 933 int OpaqueBrowserFrameView::GetTopAreaHeight() const { |
924 gfx::ImageSkia* frame_image = GetFrameImage(); | 934 gfx::ImageSkia* frame_image = GetFrameImage(); |
925 int top_area_height = frame_image->height(); | 935 int top_area_height = frame_image->height(); |
926 if (browser_view()->IsTabStripVisible()) { | 936 if (browser_view()->IsTabStripVisible()) { |
927 top_area_height = std::max(top_area_height, | 937 top_area_height = std::max(top_area_height, |
928 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); | 938 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); |
929 } | 939 } |
930 return top_area_height; | 940 return top_area_height; |
931 } | 941 } |
OLD | NEW |