Enabled the App Info dialog on the Extensions page by default

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 32cc59d81039ebc08ce3111841db6684b5cf1b09..bc97cf2029e52a3cee2abf3f96ac5031d49c923b 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -108,10 +108,23 @@ using content::RenderViewHost;
 using content::WebContents;
 
 namespace {
+
 const char kAppsDeveloperToolsExtensionId[] =
     "ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
+
+// Returns true if the extensions page should display the new-style extension
+// info dialog. If false, display the old permissions dialog.
+bool ShouldDisplayExtensionInfoDialog() {
+#if defined(OS_MACOSX)
+  return false;
+#else
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      extensions::switches::kDisableExtensionInfoDialog);
+#endif
 }
 
+}  // namespace
+
 namespace extensions {
 
 ExtensionPage::ExtensionPage(const GURL& url,
@@ -290,8 +303,7 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
   extension_data->SetString("optionsPageHref",
                             OptionsPageInfo::GetOptionsPage(extension).spec());
   extension_data->SetBoolean("enableExtensionInfoDialog",
-                             CommandLine::ForCurrentProcess()->HasSwitch(
-                                 switches::kEnableExtensionInfoDialog));
+                             ShouldDisplayExtensionInfoDialog());
 
   // Add dependent extensions.
   base::ListValue* dependents_list = new base::ListValue;
@@ -540,8 +552,7 @@ void ExtensionSettingsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD_UNPACKED));
   source->AddString("extensionSettingsOptions",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionInfoDialog)) {
+  if (ShouldDisplayExtensionInfoDialog()) {
     source->AddString("extensionSettingsPermissions",
                       l10n_util::GetStringUTF16(IDS_EXTENSIONS_INFO_LINK));
   } else {
@@ -1202,8 +1213,7 @@ void ExtensionSettingsHandler::HandlePermissionsMessage(
 
   // Show the new-style extensions dialog when the flag is set. The flag cannot
   // be set on Mac platforms.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionInfoDialog)) {
+  if (ShouldDisplayExtensionInfoDialog()) {
     UMA_HISTOGRAM_ENUMERATION("Apps.AppInfoDialog.Launches",
                               AppInfoLaunchSource::FROM_EXTENSIONS_PAGE,
                               AppInfoLaunchSource::NUM_LAUNCH_SOURCES);