Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

Issue 11446034: SupportsUserData and manifest handlers for Extension; use them for the Omnibox API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + manifestdata Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..dedb9bb85bd460999d6c138e009c86565b7fa55c 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/notification_details.h"
@@ -116,12 +117,12 @@ class ExtensionLoadedNotificationObserver
if (bundle_) {
type_ = extension_installed_bubble::kBundle;
- } else if (!extension->omnibox_keyword().empty()) {
+ } else if (!extensions::OmniboxInfo::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::OmniboxInfo::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::OmniboxInfo::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::OmniboxInfo::IsVerboseInstallMessage(extension_)) {
// The extra message is only shown when appropriate.
NSRect extraMessageFrame = [extraInfoMsg_ frame];
extraMessageFrame.origin.y = extensionMessageFrame1.origin.y - (
« no previous file with comments | « chrome/browser/ui/app_list/search_builder.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698