Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/ui/browser_instant_controller.cc

Issue 553333006: Makes InfoBarService not close infobars on a reload from browser instant (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/infobars/infobar_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser_instant_controller.h" 5 #include "chrome/browser/ui/browser_instant_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/infobars/infobar_service.h"
8 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search/instant_service.h" 10 #include "chrome/browser/search/instant_service.h"
10 #include "chrome/browser/search/instant_service_factory.h" 11 #include "chrome/browser/search/instant_service_factory.h"
11 #include "chrome/browser/search/search.h" 12 #include "chrome/browser/search/search.h"
12 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/location_bar/location_bar.h" 15 #include "chrome/browser/ui/location_bar/location_bar.h"
15 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 16 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
16 #include "chrome/browser/ui/omnibox/omnibox_view.h" 17 #include "chrome/browser/ui/omnibox/omnibox_view.h"
17 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 18 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 continue; 154 continue;
154 155
155 // Send new search URLs to the renderer. 156 // Send new search URLs to the renderer.
156 content::RenderProcessHost* rph = contents->GetRenderProcessHost(); 157 content::RenderProcessHost* rph = contents->GetRenderProcessHost();
157 instant_service->SendSearchURLsToRenderer(rph); 158 instant_service->SendSearchURLsToRenderer(rph);
158 159
159 // Reload the contents to ensure that it gets assigned to a non-priviledged 160 // Reload the contents to ensure that it gets assigned to a non-priviledged
160 // renderer. 161 // renderer.
161 if (!instant_service->IsInstantProcess(rph->GetID())) 162 if (!instant_service->IsInstantProcess(rph->GetID()))
162 continue; 163 continue;
164
163 contents->GetController().Reload(false); 165 contents->GetController().Reload(false);
166
167 // As the reload was not triggered by the user we don't want to close any
168 // infobars. We have to tell the InfoBarService after the reload, otherwise
169 // it would ignore this call when
170 // WebContentsObserver::DidStartNavigationToPendingEntry is invoked.
171 InfoBarService::FromWebContents(contents)->set_ignore_next_reload();
164 } 172 }
165 } 173 }
OLDNEW
« no previous file with comments | « chrome/browser/infobars/infobar_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698