| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 frame()->Minimize(); | 346 frame()->Minimize(); |
| 347 } else if (sender == maximize_button_) { | 347 } else if (sender == maximize_button_) { |
| 348 frame()->Maximize(); | 348 frame()->Maximize(); |
| 349 } else if (sender == restore_button_) { | 349 } else if (sender == restore_button_) { |
| 350 frame()->Restore(); | 350 frame()->Restore(); |
| 351 } else if (sender == close_button_) { | 351 } else if (sender == close_button_) { |
| 352 frame()->Close(); | 352 frame()->Close(); |
| 353 } else if (sender == new_avatar_button()) { | 353 } else if (sender == new_avatar_button()) { |
| 354 browser_view()->ShowAvatarBubbleFromAvatarButton( | 354 browser_view()->ShowAvatarBubbleFromAvatarButton( |
| 355 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, | 355 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, |
| 356 signin::GAIA_SERVICE_TYPE_NONE); | 356 signin::ManageAccountsParams()); |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 | 359 |
| 360 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, | 360 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, |
| 361 const gfx::Point& point) { | 361 const gfx::Point& point) { |
| 362 #if defined(OS_LINUX) | 362 #if defined(OS_LINUX) |
| 363 views::MenuRunner menu_runner(frame()->GetSystemMenuModel()); | 363 views::MenuRunner menu_runner(frame()->GetSystemMenuModel()); |
| 364 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), | 364 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), |
| 365 window_icon_, | 365 window_icon_, |
| 366 window_icon_->GetBoundsInScreen(), | 366 window_icon_->GetBoundsInScreen(), |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 904 | 904 |
| 905 int OpaqueBrowserFrameView::GetTopAreaHeight() const { | 905 int OpaqueBrowserFrameView::GetTopAreaHeight() const { |
| 906 gfx::ImageSkia* frame_image = GetFrameImage(); | 906 gfx::ImageSkia* frame_image = GetFrameImage(); |
| 907 int top_area_height = frame_image->height(); | 907 int top_area_height = frame_image->height(); |
| 908 if (browser_view()->IsTabStripVisible()) { | 908 if (browser_view()->IsTabStripVisible()) { |
| 909 top_area_height = std::max(top_area_height, | 909 top_area_height = std::max(top_area_height, |
| 910 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); | 910 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); |
| 911 } | 911 } |
| 912 return top_area_height; | 912 return top_area_height; |
| 913 } | 913 } |
| OLD | NEW |