| 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/location_bar/page_action_image_view.h" | 5 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/extensions/extension_action.h" | 8 #include "chrome/browser/extensions/extension_action.h" |
| 9 #include "chrome/browser/platform_util.h" | 9 #include "chrome/browser/platform_util.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/sessions/session_tab_helper.h" | 11 #include "chrome/browser/sessions/session_tab_helper.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 13 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 14 #include "extensions/browser/extension_registry.h" | 14 #include "extensions/browser/extension_registry.h" |
| 15 #include "extensions/common/constants.h" | 15 #include "extensions/common/constants.h" |
| 16 #include "ui/accessibility/ax_enums.h" |
| 16 #include "ui/accessibility/ax_view_state.h" | 17 #include "ui/accessibility/ax_view_state.h" |
| 17 #include "ui/compositor/paint_recorder.h" | 18 #include "ui/compositor/paint_recorder.h" |
| 18 #include "ui/events/event.h" | 19 #include "ui/events/event.h" |
| 19 #include "ui/gfx/canvas.h" | 20 #include "ui/gfx/canvas.h" |
| 20 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 21 #include "ui/views/controls/menu/menu_runner.h" | 22 #include "ui/views/controls/menu/menu_runner.h" |
| 22 | 23 |
| 23 // static | 24 // static |
| 24 const char PageActionImageView::kViewClassName[] = "PageActionImageView"; | 25 const char PageActionImageView::kViewClassName[] = "PageActionImageView"; |
| 25 | 26 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 nullptr, // No menu button for page action views. | 158 nullptr, // No menu button for page action views. |
| 158 gfx::Rect(screen_loc, size()), | 159 gfx::Rect(screen_loc, size()), |
| 159 views::MENU_ANCHOR_TOPLEFT, | 160 views::MENU_ANCHOR_TOPLEFT, |
| 160 source_type) == views::MenuRunner::MENU_DELETED) { | 161 source_type) == views::MenuRunner::MENU_DELETED) { |
| 161 return; | 162 return; |
| 162 } | 163 } |
| 163 | 164 |
| 164 menu_runner_.reset(); | 165 menu_runner_.reset(); |
| 165 view_controller_->OnContextMenuClosed(); | 166 view_controller_->OnContextMenuClosed(); |
| 166 } | 167 } |
| OLD | NEW |