content/app/content_main.cc - Issue 8413051: Move PageZoom enum into content/public/common and into the content namespace. Also move content_c...

Side by Side Diff: content/app/content_main.cc

Issue 8413051: Move PageZoom enum into content/public/common and into the content namespace. Also move content_c... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome_frame/external_tab_test.cc ('k') | content/browser/renderer_host/render_process_host.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/app/content_main.h"	5 #include "content/app/content_main.h"

6	6

7 #include "base/at_exit.h"	7 #include "base/at_exit.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/debug/debugger.h"	9 #include "base/debug/debugger.h"

10 #include "base/i18n/icu_util.h"	10 #include "base/i18n/icu_util.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/mac/scoped_nsautorelease_pool.h"	12 #include "base/mac/scoped_nsautorelease_pool.h"

13 #include "base/memory/scoped_ptr.h"	13 #include "base/memory/scoped_ptr.h"

14 #include "base/metrics/stats_table.h"	14 #include "base/metrics/stats_table.h"

15 #include "base/process_util.h"	15 #include "base/process_util.h"

16 #include "base/stringprintf.h"	16 #include "base/stringprintf.h"

17 #include "base/string_number_conversions.h"	17 #include "base/string_number_conversions.h"

18 #include "content/app/startup_helper_win.h"	18 #include "content/app/startup_helper_win.h"

19 #include "content/browser/browser_main.h"	19 #include "content/browser/browser_main.h"

20 #include "content/common/content_constants.h"

21 #include "content/common/main_function_params.h"	20 #include "content/common/main_function_params.h"

22 #include "content/common/sandbox_init_wrapper.h"	21 #include "content/common/sandbox_init_wrapper.h"

23 #include "content/common/set_process_title.h"	22 #include "content/common/set_process_title.h"

24 #include "content/public/app/content_main_delegate.h"	23 #include "content/public/app/content_main_delegate.h"

25 #include "content/public/common/content_client.h"	24 #include "content/public/common/content_client.h"

	25 #include "content/public/common/content_constants.h"

26 #include "content/public/common/content_paths.h"	26 #include "content/public/common/content_paths.h"

27 #include "content/public/common/content_switches.h"	27 #include "content/public/common/content_switches.h"

28 #include "crypto/nss_util.h"	28 #include "crypto/nss_util.h"

29 #include "ipc/ipc_switches.h"	29 #include "ipc/ipc_switches.h"

30 #include "ui/base/ui_base_switches.h"	30 #include "ui/base/ui_base_switches.h"

31 #include "ui/base/ui_base_paths.h"	31 #include "ui/base/ui_base_paths.h"

32 #include "webkit/glue/webkit_glue.h"	32 #include "webkit/glue/webkit_glue.h"

33	33

34 #if defined(OS_WIN)	34 #if defined(OS_WIN)

35 #include <atlbase.h>	35 #include <atlbase.h>

(...skipping 421 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
457 _CrtDumpMemoryLeaks();	457 _CrtDumpMemoryLeaks();

458 #endif // _CRTDBG_MAP_ALLOC	458 #endif // _CRTDBG_MAP_ALLOC

459	459

460 _Module.Term();	460 _Module.Term();

461 #endif // OS_WIN	461 #endif // OS_WIN

462	462

463 return exit_code;	463 return exit_code;

464 }	464 }

465	465

466 } // namespace content	466 } // namespace content

OLD	NEW