Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Side by Side Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 18223002: InstantExtended: Remove overlay control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Call renamed method. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/tab_contents/render_view_context_menu.h" 5 #include "chrome/browser/tab_contents/render_view_context_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/extensions/extension_service.h" 33 #include "chrome/browser/extensions/extension_service.h"
34 #include "chrome/browser/extensions/extension_system.h" 34 #include "chrome/browser/extensions/extension_system.h"
35 #include "chrome/browser/google/google_util.h" 35 #include "chrome/browser/google/google_util.h"
36 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 36 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
37 #include "chrome/browser/prefs/incognito_mode_prefs.h" 37 #include "chrome/browser/prefs/incognito_mode_prefs.h"
38 #include "chrome/browser/printing/print_preview_context_menu_observer.h" 38 #include "chrome/browser/printing/print_preview_context_menu_observer.h"
39 #include "chrome/browser/printing/print_preview_dialog_controller.h" 39 #include "chrome/browser/printing/print_preview_dialog_controller.h"
40 #include "chrome/browser/printing/print_view_manager.h" 40 #include "chrome/browser/printing/print_view_manager.h"
41 #include "chrome/browser/profiles/profile.h" 41 #include "chrome/browser/profiles/profile.h"
42 #include "chrome/browser/profiles/profile_io_data.h" 42 #include "chrome/browser/profiles/profile_io_data.h"
43 #include "chrome/browser/search/instant_extended_context_menu_observer.h"
44 #include "chrome/browser/search/search.h" 43 #include "chrome/browser/search/search.h"
45 #include "chrome/browser/search_engines/template_url.h" 44 #include "chrome/browser/search_engines/template_url.h"
46 #include "chrome/browser/search_engines/template_url_service.h" 45 #include "chrome/browser/search_engines/template_url_service.h"
47 #include "chrome/browser/search_engines/template_url_service_factory.h" 46 #include "chrome/browser/search_engines/template_url_service_factory.h"
48 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" 47 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
49 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" 48 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
50 #include "chrome/browser/spellchecker/spellcheck_service.h" 49 #include "chrome/browser/spellchecker/spellcheck_service.h"
51 #include "chrome/browser/tab_contents/retargeting_details.h" 50 #include "chrome/browser/tab_contents/retargeting_details.h"
52 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h" 51 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h"
53 #include "chrome/browser/tab_contents/spelling_menu_observer.h" 52 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 if (!IsDevToolsURL(params_.page_url)) 637 if (!IsDevToolsURL(params_.page_url))
639 AppendAllExtensionItems(); 638 AppendAllExtensionItems();
640 639
641 AppendDeveloperItems(); 640 AppendDeveloperItems();
642 641
643 if (!is_guest_) { 642 if (!is_guest_) {
644 if (!print_preview_menu_observer_.get()) { 643 if (!print_preview_menu_observer_.get()) {
645 print_preview_menu_observer_.reset( 644 print_preview_menu_observer_.reset(
646 new PrintPreviewContextMenuObserver(source_web_contents_)); 645 new PrintPreviewContextMenuObserver(source_web_contents_));
647 } 646 }
648 if (!instant_extended_observer_.get()) {
649 instant_extended_observer_.reset(
650 new InstantExtendedContextMenuObserver(source_web_contents_));
651 }
652 647
653 observers_.AddObserver(print_preview_menu_observer_.get()); 648 observers_.AddObserver(print_preview_menu_observer_.get());
654 observers_.AddObserver(instant_extended_observer_.get());
655 } 649 }
656 } 650 }
657 651
658 const Extension* RenderViewContextMenu::GetExtension() const { 652 const Extension* RenderViewContextMenu::GetExtension() const {
659 extensions::ExtensionSystem* system = 653 extensions::ExtensionSystem* system =
660 extensions::ExtensionSystem::Get(profile_); 654 extensions::ExtensionSystem::Get(profile_);
661 // There is no process manager in some tests. 655 // There is no process manager in some tests.
662 if (!system->process_manager()) 656 if (!system->process_manager())
663 return NULL; 657 return NULL;
664 658
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
2056 source_web_contents_->GetRenderViewHost()-> 2050 source_web_contents_->GetRenderViewHost()->
2057 ExecuteMediaPlayerActionAtLocation(location, action); 2051 ExecuteMediaPlayerActionAtLocation(location, action);
2058 } 2052 }
2059 2053
2060 void RenderViewContextMenu::PluginActionAt( 2054 void RenderViewContextMenu::PluginActionAt(
2061 const gfx::Point& location, 2055 const gfx::Point& location,
2062 const WebPluginAction& action) { 2056 const WebPluginAction& action) {
2063 source_web_contents_->GetRenderViewHost()-> 2057 source_web_contents_->GetRenderViewHost()->
2064 ExecutePluginActionAtLocation(location, action); 2058 ExecutePluginActionAtLocation(location, action);
2065 } 2059 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.h ('k') | chrome/browser/task_manager/tab_contents_resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698