diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:00:36 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:00:36 +0000 |
| commit | ae62cfa9a110544f435f6c542ebbdddd780ca686 (patch) | |
| tree | fe1c3b46bfd53b682c478ef43a1719d4d0044f86 /chrome/browser/autocomplete/autocomplete_edit_view_win.cc | |
| parent | f37c44ad8b465a2c70e39caebe43ef805bb301d6 (diff) | |
| download | chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.zip chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.tar.gz chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.tar.bz2 | |
Revert 53062 - Makes the toolbar visible for apps again. Here's the set of patches I
reverted: 49016, 47119, 47177, 46930, 46775, and the UI changes for
45566. If you see anything missing, please let me know.
Also, there are some grd strings no longer necessary. I'll nuke those
separately.
BUG=49013
TEST=none
Review URL: http://codereview.chromium.org/2888020
TBR=sky@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_win.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 1182059..901416d 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -511,6 +511,13 @@ void AutocompleteEditViewWin::SaveStateToTab(TabContents* tab) { void AutocompleteEditViewWin::Update( const TabContents* tab_for_state_restoring) { + // If we're switching to a tab with a collapsed toolbar, bail + // now, since we won't be showing the Omnibox anyway, and + // executing the code below just results in a flicker before + // the toolbar hides. + if (tab_for_state_restoring && tab_for_state_restoring->is_app()) + return; + const bool visibly_changed_permanent_text = model_->UpdatePermanentText(toolbar_model_->GetText()); |