| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/renderer_context_menu/render_view_context_menu_browsert
est_util.h" | 5 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsert
est_util.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| 11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
| 12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
| 13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" | 13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
| 14 #include "content/public/browser/notification_service.h" | 14 #include "content/public/browser/notification_service.h" |
| 15 #include "content/public/test/test_utils.h" | 15 #include "content/public/test/test_utils.h" |
| 16 | 16 |
| 17 ContextMenuNotificationObserver::ContextMenuNotificationObserver( | 17 ContextMenuNotificationObserver::ContextMenuNotificationObserver( |
| 18 int command_to_execute) | 18 int command_to_execute) |
| 19 : command_to_execute_(command_to_execute) { | 19 : command_to_execute_(command_to_execute) { |
| 20 registrar_.Add(this, | 20 registrar_.Add(this, |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 91 } |
| 92 | 92 |
| 93 content::ContextMenuParams& ContextMenuWaiter::params() { | 93 content::ContextMenuParams& ContextMenuWaiter::params() { |
| 94 return params_; | 94 return params_; |
| 95 } | 95 } |
| 96 | 96 |
| 97 void ContextMenuWaiter::Cancel(RenderViewContextMenu* context_menu) { | 97 void ContextMenuWaiter::Cancel(RenderViewContextMenu* context_menu) { |
| 98 params_ = context_menu->params(); | 98 params_ = context_menu->params(); |
| 99 context_menu->Cancel(); | 99 context_menu->Cancel(); |
| 100 } | 100 } |
| OLD | NEW |