summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/app_shim/app_shim_mac.cc5
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/about_flags.cc8
-rw-r--r--chrome/browser/apps/shortcut_manager.cc5
-rw-r--r--chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm1
-rw-r--r--chrome/browser/ui/webui/ntp/ntp_resource_cache.cc2
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h2
8 files changed, 17 insertions, 20 deletions
diff --git a/apps/app_shim/app_shim_mac.cc b/apps/app_shim/app_shim_mac.cc
index 553f07c..becce61 100644
--- a/apps/app_shim/app_shim_mac.cc
+++ b/apps/app_shim/app_shim_mac.cc
@@ -5,14 +5,13 @@
#include "apps/app_shim/app_shim_mac.h"
#include "base/command_line.h"
-#include "chrome/browser/ui/app_list/app_list_util.h"
#include "chrome/common/chrome_switches.h"
namespace apps {
bool IsAppShimsEnabled() {
- return IsAppLauncherEnabled() ||
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppShims);
+ return !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableAppShims);
}
} // namespace apps
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2c9f0fe..93e1239 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6658,11 +6658,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
Enables directory support for sync filesystem.
</message>
<if expr="is_macosx">
- <message name="IDS_FLAGS_ENABLE_APP_SHIMS_NAME" desc="Title for the flag to enable shortcuts for packaged apps to be added to Applications and to appear in the dock.">
- Enable packaged app shortcuts.
+ <message name="IDS_FLAGS_DISABLE_APP_SHIMS_NAME" desc="Title for the flag to disable shortcuts for packaged apps from being added to Applications and from appearing in the dock.">
+ Disable packaged app shortcuts.
</message>
- <message name="IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION" desc="Description for the flag to enable packaged apps appearing in the dock in OSX.">
- Enables packaged app shortcuts to be added to Applications and to appear in the dock.
+ <message name="IDS_FLAGS_DISABLE_APP_SHIMS_DESCRIPTION" desc="Description for the flag to disable packaged apps appearing in the dock in OSX.">
+ Disables packaged app shortcuts from being added to Applications and from appearing in the dock.
</message>
<message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME" desc="Title for the flag to enable a simplified Mac fullscreen interface.">
Enables simplified fullscreen.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 5fa6d99..110c173 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1588,11 +1588,11 @@ const Experiment kExperiments[] = {
#endif // ENABLE_MDNS
#if defined(OS_MACOSX)
{
- "enable-app-shims",
- IDS_FLAGS_ENABLE_APP_SHIMS_NAME,
- IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION,
+ "disable-app-shims",
+ IDS_FLAGS_DISABLE_APP_SHIMS_NAME,
+ IDS_FLAGS_DISABLE_APP_SHIMS_DESCRIPTION,
kOsMac,
- SINGLE_VALUE_TYPE(switches::kEnableAppShims)
+ SINGLE_VALUE_TYPE(switches::kDisableAppShims)
},
{
"enable-simplified-fullscreen",
diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc
index e51653e..a06141d 100644
--- a/chrome/browser/apps/shortcut_manager.cc
+++ b/chrome/browser/apps/shortcut_manager.cc
@@ -163,9 +163,8 @@ void AppShortcutManager::OnProfileWillBeRemoved(
void AppShortcutManager::OnceOffCreateShortcuts() {
bool was_enabled = prefs_->GetBoolean(prefs::kAppShortcutsHaveBeenCreated);
- // Creation of shortcuts on Mac currently sits behind --enable-app-shims.
- // Until it is enabled permanently, we need to check the flag, and set the
- // pref accordingly.
+ // Creation of shortcuts on Mac currently can be disabled with
+ // --disable-app-shims, so check the flag, and set the pref accordingly.
#if defined(OS_MACOSX)
bool is_now_enabled = apps::IsAppShimsEnabled();
#else
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 1167b5d..4042c80 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -34,7 +34,6 @@ class AppShimMenuControllerBrowserTest
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
PlatformAppBrowserTest::SetUpCommandLine(command_line);
- command_line->AppendSwitch(switches::kEnableAppShims);
}
// Start two apps and wait for them to be launched.
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 2c3d910..9596c87 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -492,7 +492,7 @@ void NTPResourceCache::CreateNewTabHTML() {
#if defined(OS_MACOSX)
load_time_data.SetBoolean(
"disableCreateAppShortcut",
- !CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppShims));
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppShims));
#endif
#if defined(OS_CHROMEOS)
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9997b9d..9154eda 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1598,14 +1598,14 @@ const char kMigrateDataDirForSxS[] = "migrate-data-dir-for-sxs";
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
#if defined(OS_MACOSX)
+// Disables the creation and launch of app shims for platform apps.
+const char kDisableAppShims[] = "disable-app-shims";
+
// Forcibly disables Lion-style on newer OSes, to allow developers to test the
// older, SnowLeopard-style fullscreen.
const char kDisableSystemFullscreenForTesting[] =
"disable-system-fullscreen-for-testing";
-// Enable to allow creation and launch of app shims for platform apps.
-const char kEnableAppShims[] = "enable-app-shims";
-
// Enables the tabs expose feature ( http://crbug.com/50307 ).
const char kEnableExposeForTabs[] = "enable-expose-for-tabs";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3bb0f4a..454a776 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -447,8 +447,8 @@ extern const char kMigrateDataDirForSxS[];
#endif
#if defined(OS_MACOSX)
+extern const char kDisableAppShims[];
extern const char kDisableSystemFullscreenForTesting[];
-extern const char kEnableAppShims[];
extern const char kEnableExposeForTabs[];
extern const char kEnableSimplifiedFullscreen[];
extern const char kKeychainReauthorize[];
generated by cgit v1.1 at 2025-02-04 03:25:38 +0000