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

Unified Diff: chrome/common/extensions/api/omnibox/omnibox_handler.cc

Issue 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action
Patch Set: Combined ActionInfo wrappers 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/common/extensions/api/omnibox/omnibox_handler.cc
diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.cc b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
index 941bdd329fee3bd008a27513068caf6d563279c4..c381e0e3fb8d6d709eecd94f275786b910c70cd0 100644
--- a/chrome/common/extensions/api/omnibox/omnibox_handler.cc
+++ b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
@@ -8,6 +8,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
@@ -30,7 +31,7 @@ const std::string& OmniboxInfo::GetKeyword(const Extension* extension) {
// static
bool OmniboxInfo::IsVerboseInstallMessage(const Extension* extension) {
return !GetKeyword(extension).empty() ||
- extension->browser_action_info() ||
+ ActionInfoData::GetBrowserActionInfo(extension) ||
(extension->page_action_info() &&
(extension->page_action_command() ||
!extension->page_action_info()->default_icon.empty()));

Powered by Google App Engine
This is Rietveld 408576698