diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 21:08:59 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 21:08:59 +0000 |
| commit | 34aea8d629c102381ccb5c8a56e3f89df969b183 (patch) | |
| tree | 426af9fb7d1a701e401b58b919489ed474393a14 /chrome/browser/ui/browser_instant_controller.h | |
| parent | 9031ef57ba679037fc675bf2f081f3880380de3a (diff) | |
| download | chromium_src-34aea8d629c102381ccb5c8a56e3f89df969b183.zip chromium_src-34aea8d629c102381ccb5c8a56e3f89df969b183.tar.gz chromium_src-34aea8d629c102381ccb5c8a56e3f89df969b183.tar.bz2 | |
Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne… (https://codereview.chromium.org/272573004/)
Reason for revert:
Seems to be causing use after free on Mac: http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%2064%20Tests%20%281%29/builds/759
Original issue's description:
> Handle TemplateURLService load failure better, and make some test correctness fixes that will be needed later.
>
> This also does a variety of miscellaneous cleanups to the modified files.
>
> BUG=364183
> TEST=none
> R=jered@chromium.org, pkasting@chromium.org
> TBR=engedy
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269329
TBR=pkasting@chromium.org,zea@chromium.org,jered@chromium.org,engedy@chromium.org,erikwright@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=364183
Review URL: https://codereview.chromium.org/273153004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.h')
| -rw-r--r-- | chrome/browser/ui/browser_instant_controller.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h index 3953c69..d9c70ca 100644 --- a/chrome/browser/ui/browser_instant_controller.h +++ b/chrome/browser/ui/browser_instant_controller.h @@ -48,12 +48,17 @@ class BrowserInstantController : public SearchModelObserver, void TabDeactivated(content::WebContents* contents); private: - // SearchModelObserver: + // Overridden from search::SearchModelObserver: virtual void ModelChanged(const SearchModel::State& old_state, const SearchModel::State& new_state) OVERRIDE; - // InstantServiceObserver: + // Overridden from InstantServiceObserver: virtual void DefaultSearchProviderChanged() OVERRIDE; + virtual void GoogleURLUpdated() OVERRIDE; + + // Reloads the tabs in instant process to ensure that their privileged status + // is still valid. + void ReloadTabsInInstantProcess(); // Replaces the contents at tab |index| with |new_contents| and deletes the // existing contents. |