diff options
| author | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 23:09:12 +0000 |
|---|---|---|
| committer | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 23:09:12 +0000 |
| commit | d58688c6401ddc2f3e34c2728b014ce8d8ca426d (patch) | |
| tree | 053a088f588ed8b79e826aee5ae668e59b7b42df /chrome/browser/tab_contents | |
| parent | baf3e1fa68088227b84c8186ef3c295d1d9aaee0 (diff) | |
| download | chromium_src-d58688c6401ddc2f3e34c2728b014ce8d8ca426d.zip chromium_src-d58688c6401ddc2f3e34c2728b014ce8d8ca426d.tar.gz chromium_src-d58688c6401ddc2f3e34c2728b014ce8d8ca426d.tar.bz2 | |
InstantExtended: Remove overlay control code.
This change deletes the browser-side InstantController code pertaining
to old Instant, the HTML popup and search results overlay. A lot of UI
and renderer code is still lingering and doing nothing, but I'll get
that in another CL.
TEST=Manually. Verify that InstantExtended NTP and searching works, and
that normal Chrome is unaffected.
BUG=251262
TBR=samarth@chromium.org,pkasting@chromium.org,brettw@chromium.org
Review URL: https://codereview.chromium.org/18516011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index b5b80b7..eb4b728 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -40,7 +40,6 @@ #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_io_data.h" -#include "chrome/browser/search/instant_extended_context_menu_observer.h" #include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" @@ -645,13 +644,8 @@ void RenderViewContextMenu::InitMenu() { print_preview_menu_observer_.reset( new PrintPreviewContextMenuObserver(source_web_contents_)); } - if (!instant_extended_observer_.get()) { - instant_extended_observer_.reset( - new InstantExtendedContextMenuObserver(source_web_contents_)); - } observers_.AddObserver(print_preview_menu_observer_.get()); - observers_.AddObserver(instant_extended_observer_.get()); } } diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index a1179a2..6f2d0b4 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -22,7 +22,6 @@ #include "ui/base/models/simple_menu_model.h" #include "ui/base/window_open_disposition.h" -class InstantExtendedContextMenuObserver; class PrintPreviewContextMenuObserver; class Profile; class SpellingMenuObserver; @@ -277,9 +276,6 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, // An observer that disables menu items when print preview is active. scoped_ptr<PrintPreviewContextMenuObserver> print_preview_menu_observer_; - // An observer that disables menu items for instant extended mode. - scoped_ptr<InstantExtendedContextMenuObserver> instant_extended_observer_; - // Our observers. mutable ObserverList<RenderViewContextMenuObserver> observers_; |