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

Unified Diff: chrome/browser/ui/views/extensions/extension_installed_bubble.cc

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/views/extensions/extension_installed_bubble.cc
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 6360f8e0284361db48b82e672f54bd16e6df30c0..e0ab37464d57e5baf03c324e8fbcfda33e08cb5b 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/ui/views/toolbar_view.h"
#include "chrome/browser/ui/webui/ntp/new_tab_ui.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"
@@ -208,7 +209,7 @@ class InstalledBubbleContent : public views::View,
case ExtensionInstalledBubble::OMNIBOX_KEYWORD: {
info_ = new views::Label(l10n_util::GetStringFUTF16(
IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
- UTF8ToUTF16(extension->omnibox_keyword())));
+ UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(extension))));
info_->SetFont(font);
info_->SetMultiLine(true);
info_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -392,12 +393,12 @@ ExtensionInstalledBubble::ExtensionInstalledBubble(const Extension* extension,
extensions::ExtensionActionManager::Get(browser_->profile());
if (extension->is_app())
type_ = APP;
- else if (!extension_->omnibox_keyword().empty())
+ else if (!extensions::OmniboxInfo::GetKeyword(extension).empty())
type_ = OMNIBOX_KEYWORD;
else if (extension_action_manager->GetBrowserAction(*extension_))
type_ = BROWSER_ACTION;
else if (extension_action_manager->GetPageAction(*extension) &&
- extension->is_verbose_install_message())
+ extensions::OmniboxInfo::IsVerboseInstallMessage(extension))
type_ = PAGE_ACTION;
else
type_ = GENERIC;
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_popup_model.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698