| Index: chrome/browser/ui/search/search_tab_helper.cc
|
| ===================================================================
|
| --- chrome/browser/ui/search/search_tab_helper.cc (revision 256983)
|
| +++ chrome/browser/ui/search/search_tab_helper.cc (working copy)
|
| @@ -142,15 +142,15 @@
|
|
|
| // Returns the OmniboxView for |contents| or NULL if not available.
|
| OmniboxView* GetOmniboxView(content::WebContents* contents) {
|
| - if (!contents)
|
| + // iOS and Android don't use the Instant framework.
|
| +#if defined(OS_IOS) || defined(OS_ANDROID)
|
| + return NULL;
|
| +#else
|
| + if (contents)
|
| return NULL;
|
| -
|
| - // iOS and Android don't use the Instant framework.
|
| -#if !defined(OS_IOS) && !defined(OS_ANDROID)
|
| Browser* browser = chrome::FindBrowserWithWebContents(contents);
|
| return browser ? browser->window()->GetLocationBar()->GetOmniboxView() : NULL;
|
| #endif
|
| - return NULL;
|
| }
|
|
|
| } // namespace
|
|
|