Mac: Prevent NTP mousewheel events from being suppressed on Lion.

chrome/browser/ui/webui/ntp/new_tab_page_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_MACOSX)

[Patrick Dubroy, 2012/04/16 21:27:59]

Whoops. There should be no changes in this file.

+#include "base/mac/mac_util.h"
+#endif
+
 static const int kIntroDisplayMax = 10;
 
 // The URL of a knowledge-base article about the new NTP.
 static const char kNtp4IntroURL[] =
     "http://www.google.com/support/chrome/bin/answer.py?answer=95451";
 
 static const char kDefaultPageTypeHistogram[] =
     "NewTabPage.DefaultPageType";
 
 NewTabPageHandler::NewTabPageHandler() : page_switch_count_(0) {
@@ skipping 147 matching lines @@
       local_state->SetInteger(prefs::kNtp4IntroDisplayCount, intro_displays);
   }
   if (intro_displays <= kIntroDisplayMax) {
     values->SetString("ntp4_intro_message",
                       l10n_util::GetStringUTF16(IDS_NTP4_INTRO_MESSAGE));
     values->SetString("ntp4_intro_url", kNtp4IntroURL);
     values->SetString("learn_more",
                       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   }
 #endif
+
+  LOG(WARNING) << "*********** ntp load";
+
+  // On Mac OS X 10.7+, horizontal scrolling can be treated as a back or
+  // forward gesture. Pass through a flag that indicates whether or not that
+  // feature is enabled.
+#if defined(OS_MACOSX)
+  values->SetBoolean("isSwipeTrackingFromScrollEventsEnabled",
+      base::mac::IsSwipeTrackingFromScrollEventsEnabled());
+#else
+  values->SetBoolean("isSwipeTrackingFromScrollEventsEnabled",
+      false);
+#endif
 }
 
 // static
 void NewTabPageHandler::DismissIntroMessage(PrefService* prefs) {
   prefs->SetInteger(prefs::kNtp4IntroDisplayCount, kIntroDisplayMax + 1);
   // No need to send notification to update resource cache, because this method
   // is only called during startup before the ntp resource cache is constructed.
 }
 
 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) {
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(notification_type,
                   content::Source<NewTabPageHandler>(this),
                   content::NotificationService::NoDetails());
 }