diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 04:03:57 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 04:03:57 +0000 |
| commit | fd2b9cec9b6eed50f8fc1fcdf72866733fe57f45 (patch) | |
| tree | 620a3ff359c4007f30c54f292de5a546739a570a /chrome/browser/browser.cc | |
| parent | 7ab36c4f07b585449febcc6f2c59a9f5a0a40eed (diff) | |
| download | chromium_src-fd2b9cec9b6eed50f8fc1fcdf72866733fe57f45.zip chromium_src-fd2b9cec9b6eed50f8fc1fcdf72866733fe57f45.tar.gz chromium_src-fd2b9cec9b6eed50f8fc1fcdf72866733fe57f45.tar.bz2 | |
Adds support for showing the match preview on views. It's behind the
flag --enable-match-preview. There is still a lot of details to get it
working good enough, but this is a good point to check some stuff in.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3105004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 83c6c48..6083fb0 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -70,6 +70,7 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_closeable_state_watcher.h" #include "chrome/browser/tab_contents/interstitial_page.h" +#include "chrome/browser/tab_contents/match_preview.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -2944,6 +2945,16 @@ void Browser::ContentTypeChanged(TabContents* source) { UpdateZoomCommandsForTabState(); } +void Browser::CommitMatchPreview(TabContents* source) { + int index = tabstrip_model_.GetIndexOfTabContents(source); + DCHECK_NE(-1, index); + TabContents* preview_contents = + source->match_preview()->ReleasePreviewContents(); + // TabStripModel takes ownership of preview_contents. + tabstrip_model_.ReplaceTabContentsAt( + index, preview_contents, TabStripModelObserver::REPLACE_MATCH_PREVIEW); +} + /////////////////////////////////////////////////////////////////////////////// // Browser, SelectFileDialog::Listener implementation: |