Port the Extension Install Bubble changes to Mac

chrome/browser/ui/views/extensions/extension_installed_bubble.cc

 // Copyright (c) 2012 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/extensions/extension_installed_bubble.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 333 matching lines @@
   new ExtensionInstalledBubble(extension, browser, icon);
 }
 
 ExtensionInstalledBubble::ExtensionInstalledBubble(const Extension* extension,
                                                    Browser *browser,
                                                    const SkBitmap& icon)
     : extension_(extension),
       browser_(browser),
       icon_(icon),
       animation_wait_retries_(0) {
-  if (extension->is_app()) {
+  if (extension->is_app())
     type_ = APP;
-  } else if (!extension_->omnibox_keyword().empty()) {
+  else if (!extension_->omnibox_keyword().empty())
     type_ = OMNIBOX_KEYWORD;
-  } else if (extension_->browser_action()) {
+  else if (extension_->browser_action())
     type_ = BROWSER_ACTION;
-  } else if (extension->page_action() &&
-             !extension->page_action()->default_icon_path().empty()) {
+  else if (extension->page_action() && extension->is_verbose_install_message())
     type_ = PAGE_ACTION;
-  } else {
+  else
     type_ = GENERIC;
-  }
 
   // |extension| has been initialized but not loaded at this point. We need
   // to wait on showing the Bubble until not only the EXTENSION_LOADED gets
   // fired, but all of the EXTENSION_LOADED Observers have run. Only then can we
   // be sure that a BrowserAction or PageAction has had views created which we
   // can inspect for the purpose of previewing of pointing to them.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
       content::Source<Profile>(browser->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(browser->profile()));
@@ skipping 105 matching lines @@
 }
 
 void ExtensionInstalledBubble::WindowClosing() {
   if (extension_ && type_ == PAGE_ACTION) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
 }