chrome/browser/browser_main.cc - Issue 4079: Porting refactoring changes:...

Side by Side Diff: chrome/browser/browser_main.cc

Issue 4079: Porting refactoring changes:... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: '' Created 12 years, 2 months 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

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 <windows.h>	5 #include <windows.h>

6 #include <shellapi.h>	6 #include <shellapi.h>

7	7

8 #include <algorithm>	8 #include <algorithm>

9	9

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

(...skipping 23 matching lines...) Expand all Loading...
34 #include "chrome/browser/plugin_service.h"	34 #include "chrome/browser/plugin_service.h"

35 #include "chrome/browser/printing/print_job_manager.h"	35 #include "chrome/browser/printing/print_job_manager.h"

36 #include "chrome/browser/rlz/rlz.h"	36 #include "chrome/browser/rlz/rlz.h"

37 #include "chrome/browser/shell_integration.h"	37 #include "chrome/browser/shell_integration.h"

38 #include "chrome/browser/url_fixer_upper.h"	38 #include "chrome/browser/url_fixer_upper.h"

39 #include "chrome/browser/user_metrics.h"	39 #include "chrome/browser/user_metrics.h"

40 #include "chrome/browser/views/user_data_dir_dialog.h"	40 #include "chrome/browser/views/user_data_dir_dialog.h"

41 #include "chrome/common/chrome_constants.h"	41 #include "chrome/common/chrome_constants.h"

42 #include "chrome/common/chrome_paths.h"	42 #include "chrome/common/chrome_paths.h"

43 #include "chrome/common/chrome_switches.h"	43 #include "chrome/common/chrome_switches.h"

44 #include "chrome/common/env_util.h"

45 #include "chrome/common/env_vars.h"	44 #include "chrome/common/env_vars.h"

46 #include "chrome/common/jstemplate_builder.h"	45 #include "chrome/common/jstemplate_builder.h"

47 #include "chrome/common/l10n_util.h"	46 #include "chrome/common/l10n_util.h"

48 #include "chrome/common/resource_bundle.h"	47 #include "chrome/common/resource_bundle.h"

49 #include "chrome/common/pref_names.h"	48 #include "chrome/common/pref_names.h"

50 #include "chrome/common/pref_service.h"	49 #include "chrome/common/pref_service.h"

51 #include "chrome/common/win_util.h"	50 #include "chrome/common/win_util.h"

52 #include "chrome/installer/util/google_update_settings.h"	51 #include "chrome/installer/util/google_update_settings.h"

53 #include "chrome/views/accelerator_handler.h"	52 #include "chrome/views/accelerator_handler.h"

54 #include "net/base/net_module.h"	53 #include "net/base/net_module.h"

(...skipping 477 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
532 // unsafe to do this cleanup if other threads are still active.	531 // unsafe to do this cleanup if other threads are still active.

533 // It is also very unnecessary, so I'm only doing this in debug to satisfy	532 // It is also very unnecessary, so I'm only doing this in debug to satisfy

534 // purify.	533 // purify.

535 if (tracking_objects)	534 if (tracking_objects)

536 tracked_objects::ThreadData::ShutdownSingleThreadedCleanup();	535 tracked_objects::ThreadData::ShutdownSingleThreadedCleanup();

537 #endif // NDEBUG	536 #endif // NDEBUG

538	537

539 return result_code;	538 return result_code;

540 }	539 }

541	540

OLD	NEW

« base/sys_info_win.cc ('K') | « base/sys_info_win.cc ('k') | chrome/browser/cache_manager_host.cc » ('j') | chrome/browser/safe_browsing/bloom_filter_unittest.cc » ('J')