Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

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

Issue 109043: Move l10n_util to app/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/field_trial.h" 12 #include "base/field_trial.h"
12 #include "base/file_util.h" 13 #include "base/file_util.h"
13 #include "base/histogram.h" 14 #include "base/histogram.h"
14 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
15 #include "base/scoped_nsautorelease_pool.h" 16 #include "base/scoped_nsautorelease_pool.h"
16 #include "base/path_service.h" 17 #include "base/path_service.h"
17 #include "base/process_util.h" 18 #include "base/process_util.h"
18 #include "base/string_piece.h" 19 #include "base/string_piece.h"
(...skipping 15 matching lines...) Expand all
34 #include "chrome/browser/net/dns_global.h" 35 #include "chrome/browser/net/dns_global.h"
35 #include "chrome/browser/plugin_service.h" 36 #include "chrome/browser/plugin_service.h"
36 #include "chrome/browser/process_singleton.h" 37 #include "chrome/browser/process_singleton.h"
37 #include "chrome/browser/profile_manager.h" 38 #include "chrome/browser/profile_manager.h"
38 #include "chrome/browser/shell_integration.h" 39 #include "chrome/browser/shell_integration.h"
39 #include "chrome/browser/user_data_manager.h" 40 #include "chrome/browser/user_data_manager.h"
40 #include "chrome/common/chrome_constants.h" 41 #include "chrome/common/chrome_constants.h"
41 #include "chrome/common/chrome_paths.h" 42 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/jstemplate_builder.h" 44 #include "chrome/common/jstemplate_builder.h"
44 #include "chrome/common/l10n_util.h"
45 #include "chrome/common/main_function_params.h" 45 #include "chrome/common/main_function_params.h"
46 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
47 #include "chrome/common/pref_service.h" 47 #include "chrome/common/pref_service.h"
48 #include "chrome/common/result_codes.h" 48 #include "chrome/common/result_codes.h"
49 #include "grit/chromium_strings.h" 49 #include "grit/chromium_strings.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/net_resources.h" 51 #include "grit/net_resources.h"
52 #include "net/base/net_module.h" 52 #include "net/base/net_module.h"
53 #include "net/http/http_network_session.h" 53 #include "net/http/http_network_session.h"
54 54
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 if (metrics) 627 if (metrics)
628 metrics->Stop(); 628 metrics->Stop();
629 629
630 // browser_shutdown takes care of deleting browser_process, so we need to 630 // browser_shutdown takes care of deleting browser_process, so we need to
631 // release it. 631 // release it.
632 browser_process.release(); 632 browser_process.release();
633 browser_shutdown::Shutdown(); 633 browser_shutdown::Shutdown();
634 634
635 return result_code; 635 return result_code;
636 } 636 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698