| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 2  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68   void ContextMenuItemSelected(const ContextMenuItem*); | 68   void ContextMenuItemSelected(const ContextMenuItem*); | 
| 69 | 69 | 
| 70   const HitTestResult& GetHitTestResult() { return hit_test_result_; } | 70   const HitTestResult& GetHitTestResult() { return hit_test_result_; } | 
| 71 | 71 | 
| 72  private: | 72  private: | 
| 73   ContextMenuController(Page*, ContextMenuClient*); | 73   ContextMenuController(Page*, ContextMenuClient*); | 
| 74 | 74 | 
| 75   std::unique_ptr<ContextMenu> CreateContextMenu(Event*); | 75   std::unique_ptr<ContextMenu> CreateContextMenu(Event*); | 
| 76   std::unique_ptr<ContextMenu> CreateContextMenu(LocalFrame*, | 76   std::unique_ptr<ContextMenu> CreateContextMenu(LocalFrame*, | 
| 77                                                  const LayoutPoint&); | 77                                                  const LayoutPoint&); | 
| 78   void PopulateCustomContextMenu(const Event&); |  | 
| 79   void ShowContextMenu(Event*); | 78   void ShowContextMenu(Event*); | 
| 80 | 79 | 
| 81   ContextMenuClient* client_; | 80   ContextMenuClient* client_; | 
| 82   std::unique_ptr<ContextMenu> context_menu_; | 81   std::unique_ptr<ContextMenu> context_menu_; | 
| 83   Member<ContextMenuProvider> menu_provider_; | 82   Member<ContextMenuProvider> menu_provider_; | 
| 84   HitTestResult hit_test_result_; | 83   HitTestResult hit_test_result_; | 
| 85 }; | 84 }; | 
| 86 | 85 | 
| 87 }  // namespace blink | 86 }  // namespace blink | 
| 88 | 87 | 
| 89 #endif  // ContextMenuController_h | 88 #endif  // ContextMenuController_h | 
| OLD | NEW | 
|---|