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

Unified Diff: chrome/browser/ui/toolbar/action_box_button_controller.cc

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 years, 11 months 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
« no previous file with comments | « chrome/browser/ui/omnibox/location_bar.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/action_box_button_controller.cc
diff --git a/chrome/browser/ui/toolbar/action_box_button_controller.cc b/chrome/browser/ui/toolbar/action_box_button_controller.cc
index 51c8c8fad952ee630b3b3fdbade8020855bce98b..7d8c0fd54244b37e5e2754e862d22b26c4355f7d 100644
--- a/chrome/browser/ui/toolbar/action_box_button_controller.cc
+++ b/chrome/browser/ui/toolbar/action_box_button_controller.cc
@@ -30,11 +30,13 @@
namespace {
+#if defined(ENABLE_WEB_INTENTS)
// This indicates we need to send UMA data about the number of
// "Share with X" commands shown in the menu after user tried to
// find share extensions from web store or the first use of action
// box after browser starts.
static bool send_uma_share_command_count = true;
+#endif
// Share intents get command IDs that are beyond the maximal valid command ID
// (0xDFFF) so that they are not confused with actual commands that appear in
@@ -75,11 +77,13 @@ void ActionBoxButtonController::OnButtonClicked() {
scoped_ptr<ActionBoxMenuModel> menu_model(
new ActionBoxMenuModel(browser_, this));
- // Add share intent triggers and a link to the web store.
- // Web Intents are not currently supported in Incognito mode.
ExtensionService* extension_service =
extensions::ExtensionSystem::Get(browser_->profile())->
extension_service();
+
+#if defined(ENABLE_WEB_INTENTS)
+ // Add share intent triggers and a link to the web store.
+ // Web Intents are not currently supported in Incognito mode.
if (!browser_->profile()->IsOffTheRecord()) {
int next_share_intent_command_id = SHARE_COMMAND_FIRST;
share_intent_service_ids_.clear();
@@ -119,6 +123,7 @@ void ActionBoxButtonController::OnButtonClicked() {
send_uma_share_command_count = false;
}
}
+#endif
// Add Extensions.
next_extension_command_id_ = EXTENSION_COMMAND_FIRST;
@@ -155,11 +160,13 @@ void ActionBoxButtonController::ExecuteCommand(int command_id) {
return;
}
+#if defined(ENABLE_WEB_INTENTS)
// Handle link to the CWS web store.
if (command_id == CWS_FIND_SHARE_INTENTS_COMMAND) {
NavigateToWebStoreShareIntentsList();
return;
}
+#endif
// Handle commands associated with extensions.
// Note that the extension might have been uninstalled or disabled while the
@@ -225,6 +232,7 @@ void ActionBoxButtonController::Observe(
void ActionBoxButtonController::TriggerExplicitShareIntent(
const GURL& share_service_url) {
+#if defined(ENABLE_WEB_INTENTS)
const GURL& current_url =
browser_->tab_strip_model()->GetActiveWebContents()->GetURL();
webkit_glue::WebIntentData intent_data(
@@ -234,9 +242,11 @@ void ActionBoxButtonController::TriggerExplicitShareIntent(
intent_data.service = share_service_url;
static_cast<content::WebContentsDelegate*>(browser_)->WebIntentDispatch(
NULL, content::WebIntentsDispatcher::Create(intent_data));
+#endif
}
void ActionBoxButtonController::NavigateToWebStoreShareIntentsList() {
+#if defined(ENABLE_WEB_INTENTS)
const GURL& query_url = extension_urls::GetWebstoreIntentQueryURL(
kShareIntentAction,
kShareIntentMimeType);
@@ -247,4 +257,5 @@ void ActionBoxButtonController::NavigateToWebStoreShareIntentsList() {
content::RecordAction(UserMetricsAction("ActionBox.FindShareHandlers"));
send_uma_share_command_count = true;
+#endif
}
« no previous file with comments | « chrome/browser/ui/omnibox/location_bar.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698