| Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
|
| index 79191296a4980740406474496e7aefa22cf586cd..779a19b2d0465cdfd8b8ae28a4b7f411f8b42206 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
|
| @@ -11,6 +11,7 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/extensions/api/commands/command_service.h"
|
| #include "chrome/browser/extensions/api/commands/command_service_factory.h"
|
| +#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
|
| #include "chrome/browser/extensions/bundle_installer.h"
|
| #include "chrome/browser/extensions/extension_action.h"
|
| #include "chrome/browser/extensions/extension_action_manager.h"
|
| @@ -116,12 +117,12 @@ class ExtensionLoadedNotificationObserver
|
|
|
| if (bundle_) {
|
| type_ = extension_installed_bubble::kBundle;
|
| - } else if (!extension->omnibox_keyword().empty()) {
|
| + } else if (!extensions::OmniboxAPI::GetKeyword(extension).empty()) {
|
| type_ = extension_installed_bubble::kOmniboxKeyword;
|
| } else if (extension_action_manager->GetBrowserAction(*extension)) {
|
| type_ = extension_installed_bubble::kBrowserAction;
|
| } else if (extension_action_manager->GetPageAction(*extension) &&
|
| - extension->is_verbose_install_message()) {
|
| + extensions::OmniboxAPI::IsVerboseInstallMessage(extension)) {
|
| type_ = extension_installed_bubble::kPageAction;
|
| } else {
|
| type_ = extension_installed_bubble::kGeneric;
|
| @@ -390,7 +391,7 @@ class ExtensionLoadedNotificationObserver
|
| if (type_ == extension_installed_bubble::kOmniboxKeyword) {
|
| [extraInfoMsg_ setStringValue:l10n_util::GetNSStringF(
|
| IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
|
| - UTF8ToUTF16(extension_->omnibox_keyword()))];
|
| + UTF8ToUTF16(extensions::OmniboxAPI::GetKeyword(extension_)))];
|
| [extraInfoMsg_ setHidden:NO];
|
| [[extraInfoMsg_ cell]
|
| setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
|
| @@ -513,7 +514,7 @@ class ExtensionLoadedNotificationObserver
|
| extensionMessageFrame1.size.height +
|
| extension_installed_bubble::kOuterVerticalMargin);
|
| [extensionInstalledMsg_ setFrame:extensionMessageFrame1];
|
| - if (extension_->is_verbose_install_message()) {
|
| + if (extensions::OmniboxAPI::IsVerboseInstallMessage(extension_)) {
|
| // The extra message is only shown when appropriate.
|
| NSRect extraMessageFrame = [extraInfoMsg_ frame];
|
| extraMessageFrame.origin.y = extensionMessageFrame1.origin.y - (
|
|
|