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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/character_encoding.cc ('k') | chrome/browser/chrome_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "chrome/common/chrome_constants.h" 94 #include "chrome/common/chrome_constants.h"
95 #include "chrome/common/chrome_paths.h" 95 #include "chrome/common/chrome_paths.h"
96 #include "chrome/common/chrome_result_codes.h" 96 #include "chrome/common/chrome_result_codes.h"
97 #include "chrome/common/chrome_switches.h" 97 #include "chrome/common/chrome_switches.h"
98 #include "chrome/common/crash_keys.h" 98 #include "chrome/common/crash_keys.h"
99 #include "chrome/common/env_vars.h" 99 #include "chrome/common/env_vars.h"
100 #include "chrome/common/logging_chrome.h" 100 #include "chrome/common/logging_chrome.h"
101 #include "chrome/common/net/net_resource_provider.h" 101 #include "chrome/common/net/net_resource_provider.h"
102 #include "chrome/common/pref_names.h" 102 #include "chrome/common/pref_names.h"
103 #include "chrome/common/profiling.h" 103 #include "chrome/common/profiling.h"
104 #include "chrome/grit/generated_resources.h"
104 #include "chrome/installer/util/google_update_settings.h" 105 #include "chrome/installer/util/google_update_settings.h"
105 #include "components/component_updater/component_updater_service.h" 106 #include "components/component_updater/component_updater_service.h"
106 #include "components/google/core/browser/google_util.h" 107 #include "components/google/core/browser/google_util.h"
107 #include "components/language_usage_metrics/language_usage_metrics.h" 108 #include "components/language_usage_metrics/language_usage_metrics.h"
108 #include "components/metrics/metrics_service.h" 109 #include "components/metrics/metrics_service.h"
109 #include "components/nacl/browser/nacl_browser.h" 110 #include "components/nacl/browser/nacl_browser.h"
110 #include "components/rappor/rappor_service.h" 111 #include "components/rappor/rappor_service.h"
111 #include "components/signin/core/common/profile_management_switches.h" 112 #include "components/signin/core/common/profile_management_switches.h"
112 #include "components/startup_metric_utils/startup_metric_utils.h" 113 #include "components/startup_metric_utils/startup_metric_utils.h"
113 #include "components/translate/content/common/cld_data_source.h" 114 #include "components/translate/content/common/cld_data_source.h"
114 #include "components/translate/core/browser/translate_download_manager.h" 115 #include "components/translate/core/browser/translate_download_manager.h"
115 #include "components/variations/variations_http_header_provider.h" 116 #include "components/variations/variations_http_header_provider.h"
116 #include "content/public/browser/browser_thread.h" 117 #include "content/public/browser/browser_thread.h"
117 #include "content/public/browser/notification_observer.h" 118 #include "content/public/browser/notification_observer.h"
118 #include "content/public/browser/notification_registrar.h" 119 #include "content/public/browser/notification_registrar.h"
119 #include "content/public/browser/notification_service.h" 120 #include "content/public/browser/notification_service.h"
120 #include "content/public/browser/notification_types.h" 121 #include "content/public/browser/notification_types.h"
121 #include "content/public/browser/site_instance.h" 122 #include "content/public/browser/site_instance.h"
122 #include "content/public/common/content_client.h" 123 #include "content/public/common/content_client.h"
123 #include "content/public/common/content_switches.h" 124 #include "content/public/common/content_switches.h"
124 #include "content/public/common/main_function_params.h" 125 #include "content/public/common/main_function_params.h"
125 #include "extensions/browser/extension_protocols.h" 126 #include "extensions/browser/extension_protocols.h"
126 #include "grit/app_locale_settings.h" 127 #include "grit/app_locale_settings.h"
127 #include "grit/browser_resources.h" 128 #include "grit/browser_resources.h"
128 #include "grit/generated_resources.h"
129 #include "grit/platform_locale_settings.h" 129 #include "grit/platform_locale_settings.h"
130 #include "net/base/net_module.h" 130 #include "net/base/net_module.h"
131 #include "net/base/sdch_manager.h" 131 #include "net/base/sdch_manager.h"
132 #include "net/cookies/cookie_monster.h" 132 #include "net/cookies/cookie_monster.h"
133 #include "net/http/http_network_layer.h" 133 #include "net/http/http_network_layer.h"
134 #include "net/http/http_stream_factory.h" 134 #include "net/http/http_stream_factory.h"
135 #include "net/url_request/url_request.h" 135 #include "net/url_request/url_request.h"
136 #include "ui/base/l10n/l10n_util.h" 136 #include "ui/base/l10n/l10n_util.h"
137 #include "ui/base/layout.h" 137 #include "ui/base/layout.h"
138 #include "ui/base/resource/resource_bundle.h" 138 #include "ui/base/resource/resource_bundle.h"
(...skipping 1524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 chromeos::CrosSettings::Shutdown(); 1663 chromeos::CrosSettings::Shutdown();
1664 #endif 1664 #endif
1665 #endif 1665 #endif
1666 } 1666 }
1667 1667
1668 // Public members: 1668 // Public members:
1669 1669
1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1671 chrome_extra_parts_.push_back(parts); 1671 chrome_extra_parts_.push_back(parts);
1672 } 1672 }
OLDNEW
« no previous file with comments | « chrome/browser/character_encoding.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698