Chromium Code Reviews| Index: chrome/browser/search_engines/template_url_service.cc |
| diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc |
| index 5bdfce6fe186a2ecb7f99aa16b5855c216493302..93108b0f507dd285fe7397bfa84cc2686b750d4f 100644 |
| --- a/chrome/browser/search_engines/template_url_service.cc |
| +++ b/chrome/browser/search_engines/template_url_service.cc |
| @@ -6,6 +6,7 @@ |
| #include "base/auto_reset.h" |
| #include "base/command_line.h" |
| +#include "base/compiler_specific.h" |
| #include "base/environment.h" |
| #include "base/guid.h" |
| #include "base/i18n/case_conversion.h" |
| @@ -698,8 +699,8 @@ void TemplateURLService::OnWebDataServiceRequestDone( |
| // Check if the default search provider has been changed in Web Data by |
| // another program. No immediate action is performed because the default |
| // search may be changed below by Sync which effectively undoes the hijacking. |
| - bool is_default_search_hijacked = false; |
| - TemplateURL* hijacked_default_search_provider = NULL; |
| + bool ALLOW_UNUSED is_default_search_hijacked = false; |
|
James Hawkins
2012/07/30 03:09:09
Why are you using ALLOW_UNUSED here?
michaelbai
2012/07/30 16:59:21
I compiled this file by the gcc 4.6, there was a
|
| + TemplateURL* ALLOW_UNUSED hijacked_default_search_provider = NULL; |
| scoped_ptr<TemplateURL> backup_default_search_provider; |
| // No check is required if the default search is managed. |
| // |DidDefaultSearchProviderChange| must always be called because it will |