summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:22:04 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:22:04 +0000
commita0b846623f3c7dbf6cbc6a36cd71135f5d218ca3 (patch)
tree20bf34a75e48029fd2149c0973bec9107c3891ef /chrome/browser/gtk
parent1f8d420b980bb1bb0d18d8486656751460cfcc2b (diff)
downloadchromium_src-a0b846623f3c7dbf6cbc6a36cd71135f5d218ca3.zip
chromium_src-a0b846623f3c7dbf6cbc6a36cd71135f5d218ca3.tar.gz
chromium_src-a0b846623f3c7dbf6cbc6a36cd71135f5d218ca3.tar.bz2
Changes instant around to support multiple loaders. This is
necessitated by needing to hold off on showing instant results until I know if the server really supports instant. This change is mostly refactoring to enable this. Most of what was MatchPreview has been moved into MatchPreviewLoader. LoaderManager is used to determine which MatchPreviewLoader to use as well as keeping around a cache of them. MatchPreview for the most part delegates to LoaderManager and MatchPreviewLoader now. I'll rename all these classes to instant (and move into its own directory) next. BUG=54833 TEST=none Review URL: http://codereview.chromium.org/3541008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/gtk/browser_window_gtk.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 58b1db5..d3146fa 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1133,7 +1133,7 @@ void BrowserWindowGtk::Paste() {
DoCutCopyPaste(this, &RenderViewHost::Paste, "paste-clipboard");
}
-void BrowserWindowGtk::ShowMatchPreview() {
+void BrowserWindowGtk::ShowMatchPreview(TabContents* preview_contents) {
// TODO: implement me
NOTIMPLEMENTED();
}
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index b032a96..b5da791 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -123,7 +123,7 @@ class BrowserWindowGtk : public BrowserWindow,
virtual void Copy();
virtual void Paste();
virtual void ToggleTabStripMode() {}
- virtual void ShowMatchPreview();
+ virtual void ShowMatchPreview(TabContents* preview_contents);
virtual void HideMatchPreview();
virtual gfx::Rect GetMatchPreviewBounds();