Commit af86f4ca authored by dimich's avatar dimich Committed by Commit bot

Revert the patch that has disabled Panels for M53 (https://codereview.chromium.org/2083113002)

The current plan is to remove the code for M54 but
keep the Panels enabled for M53 to provide more time for transition.

BUG=571511

Review-Url: https://codereview.chromium.org/2176823002
Cr-Commit-Position: refs/heads/master@{#407262}
parent f206568f
...@@ -5558,7 +5558,7 @@ Keep your key file in a safe place. You will need it to create new versions of y ...@@ -5558,7 +5558,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Panels Panels
</message> </message>
<message name="IDS_FLAGS_PANELS_DESCRIPTION" desc="Description for the flag to enable Panel windows."> <message name="IDS_FLAGS_PANELS_DESCRIPTION" desc="Description for the flag to enable Panel windows.">
Allow extensions to create panel windows that open outside of the browser frame. By default or if disabled, an attempt to open a panel will open a popup instead. Panels on desktop OSes are deprecated and will be removed soon. Allow extensions to create panel windows that open outside of the browser frame. Attempts to open a panel will open a popup instead if not enabled. Default behavior is to allow only for whitelisted extensions. Enabled behavior is to allow for all extensions. Disabled behavior is to disallow panels for any extension.
</message> </message>
<message name="IDS_FLAGS_WEBGL2_NAME" desc="Name of the 'Enable WebGL 2.0' flag."> <message name="IDS_FLAGS_WEBGL2_NAME" desc="Name of the 'Enable WebGL 2.0' flag.">
WebGL 2.0 Prototype WebGL 2.0 Prototype
......
...@@ -131,16 +131,11 @@ bool PanelManager::ShouldUsePanels(const std::string& extension_id) { ...@@ -131,16 +131,11 @@ bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
} }
#endif // USE_X11 && !OS_CHROMEOS #endif // USE_X11 && !OS_CHROMEOS
// Panels are an Eraser target. See http://crbug.com/571511 for details. // Without --enable-panels, only support Hangouts.
// TODO(dimich): remove the rest of Panels code (except ChromeOS) once
// erasure is stable.
#if defined(OS_CHROMEOS)
// Without --enable-panels, only support Hangouts on ChromeOS.
for (const char* id : extension_misc::kHangoutsExtensionIds) { for (const char* id : extension_misc::kHangoutsExtensionIds) {
if (extension_id == id) if (extension_id == id)
return true; return true;
} }
#endif // OS_CHROMEOS
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment