summaryrefslogtreecommitdiffstats
path: root/content/app
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 22:02:48 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 22:02:48 +0000
commit54087fe8d2a28e337a2147d13130586331e918d0 (patch)
tree1192be7b52d8a1d889eefd3a203d8625547f6367 /content/app
parentca2e7208d1f662943849fbefecb88e38008881b8 (diff)
downloadchromium_src-54087fe8d2a28e337a2147d13130586331e918d0.zip
chromium_src-54087fe8d2a28e337a2147d13130586331e918d0.tar.gz
chromium_src-54087fe8d2a28e337a2147d13130586331e918d0.tar.bz2
Move PageZoom enum into content/public/common and into the content namespace. Also move content_costants to content/public/common.
BUG=98716 Review URL: http://codereview.chromium.org/8413051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
-rw-r--r--content/app/content_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/app/content_main.cc b/content/app/content_main.cc
index 21f3f55..2494dc4 100644
--- a/content/app/content_main.cc
+++ b/content/app/content_main.cc
@@ -17,12 +17,12 @@
#include "base/string_number_conversions.h"
#include "content/app/startup_helper_win.h"
#include "content/browser/browser_main.h"
-#include "content/common/content_constants.h"
#include "content/common/main_function_params.h"
#include "content/common/sandbox_init_wrapper.h"
#include "content/common/set_process_title.h"
#include "content/public/app/content_main_delegate.h"
#include "content/public/common/content_client.h"
+#include "content/public/common/content_constants.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
#include "crypto/nss_util.h"