From 45b41096eaac351b5e4fa9154bb06087968e9289 Mon Sep 17 00:00:00 2001 From: "sugoi@chromium.org" Date: Thu, 22 Aug 2013 19:58:29 +0000 Subject: Fixing switch order BUG= Review URL: https://chromiumcodereview.appspot.com/22831029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219084 0039d316-1c4b-4281-b951-d872f2087c98 --- content/public/common/content_switches.cc | 6 +++--- content/public/common/content_switches.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 63e94df..36f707f 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -10,6 +10,9 @@ namespace switches { // override for developers who need the old behavior for testing. const char kAllowFileAccessFromFiles[] = "allow-file-access-from-files"; +// Allows filters (SkImageFilter objects) to be sent between processes over IPC +const char kAllowFiltersOverIPC[] = "allow-filters-over-ipc"; + // Enables the sandboxed processes to run without a job object assigned to them. // This flag is required to allow Chrome to run in RemoteApps or Citrix. This // flag can reduce the security of the sandboxed processes and allow them to do @@ -937,7 +940,4 @@ extern const char kTestCompositor[] = "test-compositor"; // Don't dump stuff here, follow the same order as the header. -// Allows filters (SkImageFilter objects) to be sent between processes over IPC -const char kAllowFiltersOverIPC[] = "allow-filters-over-ipc"; - } // namespace switches diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index c468139..f2a0829 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -15,6 +15,7 @@ namespace switches { // All switches in alphabetical order. The switches should be documented // alongside the definition of their values in the .cc file. CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[]; +CONTENT_EXPORT extern const char kAllowFiltersOverIPC[]; CONTENT_EXPORT extern const char kAllowNoSandboxJob[]; extern const char kAllowSandboxDebugging[]; extern const char kAllowWebUICompositing[]; @@ -284,8 +285,6 @@ CONTENT_EXPORT extern const char kTestCompositor[]; // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in // alphabetical order, or in one of the ifdefs (also in order in each section). -CONTENT_EXPORT extern const char kAllowFiltersOverIPC[]; - } // namespace switches #endif // CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_ -- cgit v1.1