| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/panels/panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/themes/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
| 10 #include "chrome/browser/ui/panels/panel.h" | 10 #include "chrome/browser/ui/panels/panel.h" |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 top_height, | 406 top_height, |
| 407 std::max(0, width() - (2 * border_thickness)), | 407 std::max(0, width() - (2 * border_thickness)), |
| 408 std::max(0, height() - top_height - border_thickness)); | 408 std::max(0, height() - top_height - border_thickness)); |
| 409 } | 409 } |
| 410 | 410 |
| 411 void PanelBrowserFrameView::GetAccessibleState(ui::AccessibleViewState* state) { | 411 void PanelBrowserFrameView::GetAccessibleState(ui::AccessibleViewState* state) { |
| 412 state->role = ui::AccessibilityTypes::ROLE_TITLEBAR; | 412 state->role = ui::AccessibilityTypes::ROLE_TITLEBAR; |
| 413 } | 413 } |
| 414 | 414 |
| 415 bool PanelBrowserFrameView::OnMousePressed(const views::MouseEvent& event) { | 415 bool PanelBrowserFrameView::OnMousePressed(const views::MouseEvent& event) { |
| 416 if (browser_view_->OnTitleBarMousePressed(event)) | 416 if (event.IsOnlyLeftMouseButton() && |
| 417 browser_view_->OnTitleBarMousePressed(event.location())) { |
| 417 return true; | 418 return true; |
| 419 } |
| 418 return BrowserNonClientFrameView::OnMousePressed(event); | 420 return BrowserNonClientFrameView::OnMousePressed(event); |
| 419 } | 421 } |
| 420 | 422 |
| 421 bool PanelBrowserFrameView::OnMouseDragged(const views::MouseEvent& event) { | 423 bool PanelBrowserFrameView::OnMouseDragged(const views::MouseEvent& event) { |
| 422 if (browser_view_->OnTitleBarMouseDragged(event)) | 424 if (browser_view_->OnTitleBarMouseDragged(event.location())) |
| 423 return true; | 425 return true; |
| 424 return BrowserNonClientFrameView::OnMouseDragged(event); | 426 return BrowserNonClientFrameView::OnMouseDragged(event); |
| 425 } | 427 } |
| 426 | 428 |
| 427 void PanelBrowserFrameView::OnMouseReleased(const views::MouseEvent& event) { | 429 void PanelBrowserFrameView::OnMouseReleased(const views::MouseEvent& event) { |
| 428 if (browser_view_->OnTitleBarMouseReleased(event)) | 430 if (browser_view_->OnTitleBarMouseReleased()) |
| 429 return; | 431 return; |
| 430 BrowserNonClientFrameView::OnMouseReleased(event); | 432 BrowserNonClientFrameView::OnMouseReleased(event); |
| 431 } | 433 } |
| 432 | 434 |
| 433 void PanelBrowserFrameView::OnMouseCaptureLost() { | 435 void PanelBrowserFrameView::OnMouseCaptureLost() { |
| 434 if (browser_view_->OnTitleBarMouseCaptureLost()) | 436 if (browser_view_->OnTitleBarMouseCaptureLost()) |
| 435 return; | 437 return; |
| 436 BrowserNonClientFrameView::OnMouseCaptureLost(); | 438 BrowserNonClientFrameView::OnMouseCaptureLost(); |
| 437 } | 439 } |
| 438 | 440 |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 settings_menu_contents_.AddItem( | 750 settings_menu_contents_.AddItem( |
| 749 COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE)); | 751 COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE)); |
| 750 settings_menu_contents_.AddItem( | 752 settings_menu_contents_.AddItem( |
| 751 COMMAND_UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); | 753 COMMAND_UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); |
| 752 settings_menu_contents_.AddSeparator(); | 754 settings_menu_contents_.AddSeparator(); |
| 753 settings_menu_contents_.AddItem( | 755 settings_menu_contents_.AddItem( |
| 754 COMMAND_MANAGE, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS)); | 756 COMMAND_MANAGE, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS)); |
| 755 | 757 |
| 756 settings_menu_adapter_.BuildMenu(&settings_menu_); | 758 settings_menu_adapter_.BuildMenu(&settings_menu_); |
| 757 } | 759 } |
| OLD | NEW |