| 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/browser_action_view.h" | 5 #include "chrome/browser/ui/views/browser_action_view.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/extensions/api/commands/command_service.h" | 8 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 9 #include "chrome/browser/extensions/api/commands/command_service_factory.h" | 9 #include "chrome/browser/extensions/api/commands/command_service_factory.h" |
| 10 #include "chrome/browser/extensions/extension_context_menu_model.h" | 10 #include "chrome/browser/extensions/extension_context_menu_model.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/views/browser_actions_container.h" | 12 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 13 #include "chrome/browser/ui/views/toolbar_view.h" | 13 #include "chrome/browser/ui/views/toolbar_view.h" |
| 14 #include "chrome/common/chrome_notification_types.h" | 14 #include "chrome/common/chrome_notification_types.h" |
| 15 #include "chrome/common/extensions/extension.h" | 15 #include "chrome/common/extensions/extension.h" |
| 16 #include "chrome/common/extensions/extension_manifest_constants.h" | 16 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
| 18 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
| 19 #include "ui/base/accessibility/accessible_view_state.h" | 19 #include "ui/base/accessibility/accessible_view_state.h" |
| 20 #include "ui/base/event.h" |
| 20 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 21 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 22 #include "ui/gfx/canvas.h" | 23 #include "ui/gfx/canvas.h" |
| 23 #include "ui/gfx/skbitmap_operations.h" | 24 #include "ui/gfx/skbitmap_operations.h" |
| 24 #include "ui/views/controls/menu/menu_model_adapter.h" | 25 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 25 #include "ui/views/controls/menu/menu_runner.h" | 26 #include "ui/views/controls/menu/menu_runner.h" |
| 26 | 27 |
| 27 using extensions::Extension; | 28 using extensions::Extension; |
| 28 | 29 |
| 29 namespace { | 30 namespace { |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 } | 294 } |
| 294 } | 295 } |
| 295 | 296 |
| 296 void BrowserActionButton::OnMouseExited(const views::MouseEvent& event) { | 297 void BrowserActionButton::OnMouseExited(const views::MouseEvent& event) { |
| 297 if (IsPopup() || context_menu_) | 298 if (IsPopup() || context_menu_) |
| 298 MenuButton::OnMouseExited(event); | 299 MenuButton::OnMouseExited(event); |
| 299 else | 300 else |
| 300 TextButton::OnMouseExited(event); | 301 TextButton::OnMouseExited(event); |
| 301 } | 302 } |
| 302 | 303 |
| 303 bool BrowserActionButton::OnKeyReleased(const views::KeyEvent& event) { | 304 bool BrowserActionButton::OnKeyReleased(const ui::KeyEvent& event) { |
| 304 return IsPopup() ? MenuButton::OnKeyReleased(event) | 305 return IsPopup() ? MenuButton::OnKeyReleased(event) |
| 305 : TextButton::OnKeyReleased(event); | 306 : TextButton::OnKeyReleased(event); |
| 306 } | 307 } |
| 307 | 308 |
| 308 bool BrowserActionButton::AcceleratorPressed( | 309 bool BrowserActionButton::AcceleratorPressed( |
| 309 const ui::Accelerator& accelerator) { | 310 const ui::Accelerator& accelerator) { |
| 310 panel_->OnBrowserActionExecuted(this); | 311 panel_->OnBrowserActionExecuted(this); |
| 311 return true; | 312 return true; |
| 312 } | 313 } |
| 313 | 314 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 state->role = ui::AccessibilityTypes::ROLE_GROUPING; | 421 state->role = ui::AccessibilityTypes::ROLE_GROUPING; |
| 421 } | 422 } |
| 422 | 423 |
| 423 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) { | 424 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) { |
| 424 View::PaintChildren(canvas); | 425 View::PaintChildren(canvas); |
| 425 ExtensionAction* action = button()->browser_action(); | 426 ExtensionAction* action = button()->browser_action(); |
| 426 int tab_id = panel_->GetCurrentTabId(); | 427 int tab_id = panel_->GetCurrentTabId(); |
| 427 if (tab_id >= 0) | 428 if (tab_id >= 0) |
| 428 action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id); | 429 action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id); |
| 429 } | 430 } |
| OLD | NEW |