| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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/views/settings_api_bubble_helper_views.h" | 5 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/ntp_overridden_bubble_controller.h" | 7 #include "chrome/browser/extensions/ntp_overridden_bubble_controller.h" |
| 8 #include "chrome/browser/extensions/settings_api_bubble_controller.h" | 8 #include "chrome/browser/extensions/settings_api_bubble_controller.h" |
| 9 #include "chrome/browser/extensions/settings_api_helpers.h" | 9 #include "chrome/browser/extensions/settings_api_helpers.h" |
| 10 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 void MaybeShowExtensionControlledSearchNotification( | 68 void MaybeShowExtensionControlledSearchNotification( |
| 69 Profile* profile, | 69 Profile* profile, |
| 70 content::WebContents* web_contents, | 70 content::WebContents* web_contents, |
| 71 const AutocompleteMatch& match) { | 71 const AutocompleteMatch& match) { |
| 72 #if !defined(OS_WIN) | 72 #if !defined(OS_WIN) |
| 73 return; | 73 return; |
| 74 #endif | 74 #endif |
| 75 | 75 |
| 76 if (AutocompleteMatch::IsSearchType(match.type) && | 76 if (AutocompleteMatch::IsSearchType(match.type) && |
| 77 match.type != AutocompleteMatchType::SEARCH_OTHER_ENGINE) { | 77 match.type != AutocompleteMatchType::SEARCH_OTHER_ENGINE) { |
| 78 const Extension* extension = | 78 const Extension* extension = OverridesSearchEngine(profile); |
| 79 OverridesSearchEngine(profile, NULL); | |
| 80 if (extension) { | 79 if (extension) { |
| 81 ToolbarView* toolbar = | 80 ToolbarView* toolbar = |
| 82 BrowserView::GetBrowserViewForBrowser( | 81 BrowserView::GetBrowserViewForBrowser( |
| 83 chrome::FindBrowserWithWebContents(web_contents))->toolbar(); | 82 chrome::FindBrowserWithWebContents(web_contents))->toolbar(); |
| 84 ShowSettingsApiBubble(BUBBLE_TYPE_SEARCH_ENGINE, | 83 ShowSettingsApiBubble(BUBBLE_TYPE_SEARCH_ENGINE, |
| 85 extension->id(), | 84 extension->id(), |
| 86 profile, | 85 profile, |
| 87 toolbar->app_menu(), | 86 toolbar->app_menu(), |
| 88 views::BubbleBorder::TOP_RIGHT); | 87 views::BubbleBorder::TOP_RIGHT); |
| 89 } | 88 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 new ExtensionMessageBubbleView( | 123 new ExtensionMessageBubbleView( |
| 125 BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(), | 124 BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(), |
| 126 views::BubbleBorder::TOP_RIGHT, | 125 views::BubbleBorder::TOP_RIGHT, |
| 127 ntp_overridden_bubble.PassAs< | 126 ntp_overridden_bubble.PassAs< |
| 128 ExtensionMessageBubbleController>()); | 127 ExtensionMessageBubbleController>()); |
| 129 views::BubbleDelegateView::CreateBubble(bubble_delegate); | 128 views::BubbleDelegateView::CreateBubble(bubble_delegate); |
| 130 controller->Show(bubble_delegate); | 129 controller->Show(bubble_delegate); |
| 131 } | 130 } |
| 132 | 131 |
| 133 } // namespace extensions | 132 } // namespace extensions |
| OLD | NEW |