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

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

Issue 2656523002: Rename media_resources -> localized_strings (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/common/media/media_resource_provider.h » ('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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #include "content/public/browser/notification_service.h" 149 #include "content/public/browser/notification_service.h"
150 #include "content/public/browser/notification_types.h" 150 #include "content/public/browser/notification_types.h"
151 #include "content/public/browser/site_instance.h" 151 #include "content/public/browser/site_instance.h"
152 #include "content/public/common/content_client.h" 152 #include "content/public/common/content_client.h"
153 #include "content/public/common/content_features.h" 153 #include "content/public/common/content_features.h"
154 #include "content/public/common/content_switches.h" 154 #include "content/public/common/content_switches.h"
155 #include "content/public/common/main_function_params.h" 155 #include "content/public/common/main_function_params.h"
156 #include "device/geolocation/geolocation_delegate.h" 156 #include "device/geolocation/geolocation_delegate.h"
157 #include "device/geolocation/geolocation_provider.h" 157 #include "device/geolocation/geolocation_provider.h"
158 #include "extensions/features/features.h" 158 #include "extensions/features/features.h"
159 #include "media/base/media_resources.h" 159 #include "media/base/localized_strings.h"
160 #include "media/media_features.h" 160 #include "media/media_features.h"
161 #include "net/base/net_module.h" 161 #include "net/base/net_module.h"
162 #include "net/cookies/cookie_monster.h" 162 #include "net/cookies/cookie_monster.h"
163 #include "net/http/http_network_layer.h" 163 #include "net/http/http_network_layer.h"
164 #include "net/http/http_stream_factory.h" 164 #include "net/http/http_stream_factory.h"
165 #include "net/url_request/url_request.h" 165 #include "net/url_request/url_request.h"
166 #include "printing/features/features.h" 166 #include "printing/features/features.h"
167 #include "rlz/features/features.h" 167 #include "rlz/features/features.h"
168 #include "ui/base/l10n/l10n_util.h" 168 #include "ui/base/l10n/l10n_util.h"
169 #include "ui/base/layout.h" 169 #include "ui/base/layout.h"
(...skipping 1940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 chromeos::CrosSettings::Shutdown(); 2110 chromeos::CrosSettings::Shutdown();
2111 #endif // defined(OS_CHROMEOS) 2111 #endif // defined(OS_CHROMEOS)
2112 #endif // defined(OS_ANDROID) 2112 #endif // defined(OS_ANDROID)
2113 } 2113 }
2114 2114
2115 // Public members: 2115 // Public members:
2116 2116
2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2118 chrome_extra_parts_.push_back(parts); 2118 chrome_extra_parts_.push_back(parts);
2119 } 2119 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/media/media_resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698