summaryrefslogtreecommitdiffstats
path: root/content/public/common
diff options
context:
space:
mode:
authorlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 21:01:55 +0000
committerlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 21:01:55 +0000
commit1eb20dc0d43246cf72314618dcd55f43cce37a47 (patch)
tree37930850e2f17b4aa36fa6a2103dbf6943471cd9 /content/public/common
parent9bf21b9b50fac8bea492145820bab4aeeb7c12ce (diff)
downloadchromium_src-1eb20dc0d43246cf72314618dcd55f43cce37a47.zip
chromium_src-1eb20dc0d43246cf72314618dcd55f43cce37a47.tar.gz
chromium_src-1eb20dc0d43246cf72314618dcd55f43cce37a47.tar.bz2
<browser> Make new implementation the default.
Old implementation will be togglable by a flag kEnableBrowserPluginOldImplementation. There are two js shims to create shadow DOM for two implementations, since we need to handle src differently in new path. This would also fix src attribute setting behavior in apps for the new path. Pending 1. Write tests to verify set src attribute fix for apps in new implementation path. BUG=153629,142379 TESTED=BrowserTest tests pending. Checked with platform app: a. set src initially. b. set src later via js using element.src c. set src later via js using elem.setAttribute('src', ...) Review URL: https://chromiumcodereview.appspot.com/11052019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/common')
-rw-r--r--content/public/common/content_constants.cc3
-rw-r--r--content/public/common/content_constants.h3
-rw-r--r--content/public/common/content_switches.cc4
-rw-r--r--content/public/common/content_switches.h1
4 files changed, 5 insertions, 6 deletions
diff --git a/content/public/common/content_constants.cc b/content/public/common/content_constants.cc
index 9152295..1b82375 100644
--- a/content/public/common/content_constants.cc
+++ b/content/public/common/content_constants.cc
@@ -11,9 +11,6 @@ const FilePath::CharType kPepperDataDirname[] =
FILE_PATH_LITERAL("Pepper Data");
const char kBrowserPluginMimeType[] = "application/browser-plugin";
-// TODO(fsamuel): Remove this once upstreaming of the new browser plugin is
-// complete.
-const char kBrowserPluginNewMimeType[] = "application/new-browser-plugin";
// This number used to be limited to 32 in the past (see b/535234).
const size_t kMaxRendererProcessCount = 82;
diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h
index 035f155..543660a 100644
--- a/content/public/common/content_constants.h
+++ b/content/public/common/content_constants.h
@@ -23,9 +23,6 @@ CONTENT_EXPORT extern const FilePath::CharType kPepperDataDirname[];
// The MIME type used for the browser plugin.
CONTENT_EXPORT extern const char kBrowserPluginMimeType[];
-// TODO(fsamuel): Remove this once upstreaming of the new browser plugin is
-// complete.
-CONTENT_EXPORT extern const char kBrowserPluginNewMimeType[];
CONTENT_EXPORT extern const size_t kMaxRendererProcessCount;
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index d65bc92..a7ffa55 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -247,6 +247,10 @@ const char kEnableAcceleratedFilters[] = "enable-accelerated-filters";
// Turns on extremely verbose logging of accessibility events.
const char kEnableAccessibilityLogging[] = "enable-accessibility-logging";
+// Enables old implementation path for browser plugin instead of current one.
+const char kEnableBrowserPluginOldImplementation[] =
+ "enable-browser-plugin-old-implementation";
+
// Enables the creation of compositing layers for fixed position elements.
const char kEnableCompositingForFixedPosition[] =
"enable-fixed-position-compositing";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index ba3d3d05..3dfd439 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -91,6 +91,7 @@ CONTENT_EXPORT extern const char kEnableAcceleratedPainting[];
CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
extern const char kEnableAcceleratedPlugins[];
extern const char kEnableAccessibilityLogging[];
+extern const char kEnableBrowserPluginOldImplementation[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
extern const char kEnableCssShaders[];
CONTENT_EXPORT extern const char kEnableDeviceMotion[];