diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 14:07:14 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 14:07:14 +0000 |
| commit | 0e176fae43ab2017639d692826bb0422ba66400b (patch) | |
| tree | dc6c6e23e36be7de05d7048c6b856fe05ccaabd4 | |
| parent | 60826313227f6dd6f767df046e4a91e613993538 (diff) | |
| download | chromium_src-0e176fae43ab2017639d692826bb0422ba66400b.zip chromium_src-0e176fae43ab2017639d692826bb0422ba66400b.tar.gz chromium_src-0e176fae43ab2017639d692826bb0422ba66400b.tar.bz2 | |
Add CONTENT_EXPORT to some swtiches needed for WebView
kDisableFileSystem kEnableSpatialNavigation and
kEnableSpatialNavigation need CONTENT_EXPORT
BUG=286698
Review URL: https://chromiumcodereview.appspot.com/23950007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222541 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 9 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 10906c7..83cd27d 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -61,19 +61,18 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { cl->AppendSwitch(switches::kHideScrollbars); cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); - // Not yet secure in single-process mode. + // Not yet supported in single-process mode. cl->AppendSwitch(switches::kDisableExperimentalWebGL); + cl->AppendSwitch(switches::kDisableSharedWorkers); // Ganesh backed 2D-Canvas is not yet working and causes crashes. cl->AppendSwitch(switches::kDisableAccelerated2dCanvas); // File system API not supported (requires some new API; internal bug 6930981) - // TODO(joth): export and use switches::kDisableFileSystem - cl->AppendSwitch("disable-file-system"); + cl->AppendSwitch(switches::kDisableFileSystem); // Enable D-PAD navigation for application compatibility. - // TODO(joth): export and use switches::EnableSpatialNavigation. - cl->AppendSwitch("enable-spatial-navigation"); + cl->AppendSwitch(switches::kEnableSpatialNavigation); return false; } diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index d932ba3..d051ab4 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -53,7 +53,7 @@ CONTENT_EXPORT extern const char kDisableDelegatedRenderer[]; extern const char kDisableDesktopNotifications[]; CONTENT_EXPORT extern const char kDisableDeviceOrientation[]; CONTENT_EXPORT extern const char kDisableExperimentalWebGL[]; -extern const char kDisableFileSystem[]; +CONTENT_EXPORT extern const char kDisableFileSystem[]; CONTENT_EXPORT extern const char kDisableFixedPositionCreatesStackingContext[]; CONTENT_EXPORT extern const char kDisableFlash3d[]; CONTENT_EXPORT extern const char kDisableFlashStage3d[]; @@ -85,7 +85,7 @@ extern const char kDisableRendererAccessibility[]; extern const char kDisableSeccompFilterSandbox[]; extern const char kDisableSessionStorage[]; extern const char kDisableSetuidSandbox[]; -extern const char kDisableSharedWorkers[]; +CONTENT_EXPORT extern const char kDisableSharedWorkers[]; extern const char kDisableSiteSpecificQuirks[]; CONTENT_EXPORT extern const char kDisableSmoothScrolling[]; CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[]; @@ -148,7 +148,7 @@ extern const char kEnableSandboxLogging[]; extern const char kEnableSkiaBenchmarking[]; CONTENT_EXPORT extern const char kEnableSmoothScrolling[]; CONTENT_EXPORT extern const char kEnableSoftwareCompositing[]; -extern const char kEnableSpatialNavigation[]; +CONTENT_EXPORT extern const char kEnableSpatialNavigation[]; CONTENT_EXPORT extern const char kEnableSpeechSynthesis[]; extern const char kEnableSSLCachedInfo[]; CONTENT_EXPORT extern const char kEnableStatsTable[]; |