[Reland] [Extensions] Make extension message bubble factory platform-abstract

chrome/browser/ui/views/settings_api_bubble_helper_views.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
 
 #include "chrome/browser/extensions/ntp_overridden_bubble_controller.h"
 #include "chrome/browser/extensions/settings_api_bubble_controller.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/navigation_entry.h"
 
 namespace extensions {
 
 namespace {
 
 void ShowSettingsApiBubble(SettingsApiOverrideType type,
-                           const std::string& extension_id,
                            Profile* profile,
                            views::View* anchor_view,
                            views::BubbleBorder::Arrow arrow) {
   scoped_ptr<SettingsApiBubbleController> settings_api_bubble(
       new SettingsApiBubbleController(profile, type));
-  if (!settings_api_bubble->ShouldShow(extension_id))
+  if (!settings_api_bubble->ShouldShow())
     return;
 
   SettingsApiBubbleController* controller = settings_api_bubble.get();
   ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView(
       anchor_view, arrow, settings_api_bubble.Pass());
   views::BubbleDelegateView::CreateBubble(bubble_delegate);
   controller->Show(bubble_delegate);
 }
 
 }  // namespace
 
 void MaybeShowExtensionControlledHomeNotification(Browser* browser) {
 #if !defined(OS_WIN)
   return;
 #endif
 
-  const Extension* extension =
-      GetExtensionOverridingHomepage(browser->profile());
-  if (extension) {
-    // The bubble will try to anchor itself against the home button
-    views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)->
-        toolbar()->home_button();
-    ShowSettingsApiBubble(BUBBLE_TYPE_HOME_PAGE,
-                          extension->id(),
-                          browser->profile(),
-                          anchor_view,
-                          views::BubbleBorder::TOP_LEFT);
-  }
+  // The bubble will try to anchor itself against the home button
+  views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)->
+      toolbar()->home_button();
+  ShowSettingsApiBubble(BUBBLE_TYPE_HOME_PAGE,
+                        browser->profile(),
+                        anchor_view,
+                        views::BubbleBorder::TOP_LEFT);
 }
 
 void MaybeShowExtensionControlledSearchNotification(
     Profile* profile,
     content::WebContents* web_contents,
     const AutocompleteMatch& match) {
 #if !defined(OS_WIN)
   return;
 #endif
 
   if (AutocompleteMatch::IsSearchType(match.type) &&
       match.type != AutocompleteMatchType::SEARCH_OTHER_ENGINE) {
-    const Extension* extension = GetExtensionOverridingSearchEngine(profile);
-    if (extension) {
-      ToolbarView* toolbar =
-          BrowserView::GetBrowserViewForBrowser(
-              chrome::FindBrowserWithWebContents(web_contents))->toolbar();
-      ShowSettingsApiBubble(BUBBLE_TYPE_SEARCH_ENGINE,
-                            extension->id(),
-                            profile,
-                            toolbar->app_menu(),
-                            views::BubbleBorder::TOP_RIGHT);
-    }
+    ToolbarView* toolbar =
+        BrowserView::GetBrowserViewForBrowser(
+            chrome::FindBrowserWithWebContents(web_contents))->toolbar();
+    ShowSettingsApiBubble(BUBBLE_TYPE_SEARCH_ENGINE,
+                          profile,
+                          toolbar->app_menu(),
+                          views::BubbleBorder::TOP_RIGHT);
   }
 }
 
 void MaybeShowExtensionControlledNewTabPage(
     Browser* browser, content::WebContents* web_contents) {
 #if !defined(OS_WIN)
   return;
 #endif
 
   content::NavigationEntry* entry =
@@ skipping 22 matching lines @@
   NtpOverriddenBubbleController* controller = ntp_overridden_bubble.get();
   ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView(
       BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(),
       views::BubbleBorder::TOP_RIGHT,
       ntp_overridden_bubble.Pass());
   views::BubbleDelegateView::CreateBubble(bubble_delegate);
   controller->Show(bubble_delegate);
 }
 
 }  // namespace extensions