diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:33:03 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:33:03 +0000 |
commit | 995e402e14f8dd8c48efc6a191e9b8764700d617 (patch) | |
tree | d77b95716b36c439f9588c8041fd61e5aac6fc0c /chrome/browser/autocomplete | |
parent | 8f90bbcedd2241d361fc9cb8e93803343698500b (diff) | |
download | chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.zip chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.gz chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.bz2 |
Attemp 2 at:
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
TBR=finnur
Review URL: http://codereview.chromium.org/3056003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 901416d..1182059 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -511,13 +511,6 @@ 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()); |