diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 06:49:58 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 06:49:58 +0000 |
| commit | d154026cca5ac89e3b9b93acf41296efff5dc5c7 (patch) | |
| tree | 9323bf6460d6aaa9cc8510aba349203964f544c7 /chrome/browser/instant/instant_controller.cc | |
| parent | b6a0c59e8bb89b56ef158f640b091b0c809443a4 (diff) | |
| download | chromium_src-d154026cca5ac89e3b9b93acf41296efff5dc5c7.zip chromium_src-d154026cca5ac89e3b9b93acf41296efff5dc5c7.tar.gz chromium_src-d154026cca5ac89e3b9b93acf41296efff5dc5c7.tar.bz2 | |
Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to move the data members of TemplateURL into a new class later.
This changes the accessors for TemplateURL's TemplateURLRefs. There are now separate accessors for the URLs as strings and as TemplateURLRefs, and the latter have changed to returning a const ref, meaning they no longer return NULL when the corresponding URL string is empty. This makes a number of callers clearer.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9968016
TBR=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9965143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_controller.cc')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index a13a193..ef6ec95 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -498,8 +498,8 @@ void InstantController::UpdateLoader(const TemplateURL* template_url, // Returns true if |template_url| is a valid TemplateURL for use by instant. bool InstantController::IsValidInstantTemplateURL( const TemplateURL* template_url) { - return template_url && template_url->id() && - template_url->instant_url_ref().SupportsReplacement() && + return template_url && template_url->instant_url() && template_url->id() && + template_url->instant_url()->SupportsReplacement() && !IsBlacklistedFromInstant(template_url->id()); } |