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

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

Issue 1339183002: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize in run_all_unittests. Created 5 years, 3 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
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/browser/ui/uma_browsing_activity_observer.h" 94 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
96 #include "chrome/common/channel_info.h" 96 #include "chrome/common/channel_info.h"
97 #include "chrome/common/chrome_constants.h" 97 #include "chrome/common/chrome_constants.h"
98 #include "chrome/common/chrome_paths.h" 98 #include "chrome/common/chrome_paths.h"
99 #include "chrome/common/chrome_result_codes.h" 99 #include "chrome/common/chrome_result_codes.h"
100 #include "chrome/common/chrome_switches.h" 100 #include "chrome/common/chrome_switches.h"
101 #include "chrome/common/crash_keys.h" 101 #include "chrome/common/crash_keys.h"
102 #include "chrome/common/env_vars.h" 102 #include "chrome/common/env_vars.h"
103 #include "chrome/common/logging_chrome.h" 103 #include "chrome/common/logging_chrome.h"
104 #include "chrome/common/media/media_resource_provider.h"
104 #include "chrome/common/net/net_resource_provider.h" 105 #include "chrome/common/net/net_resource_provider.h"
105 #include "chrome/common/pref_names.h" 106 #include "chrome/common/pref_names.h"
106 #include "chrome/common/profiling.h" 107 #include "chrome/common/profiling.h"
107 #include "chrome/common/variations/variations_util.h" 108 #include "chrome/common/variations/variations_util.h"
108 #include "chrome/grit/generated_resources.h" 109 #include "chrome/grit/generated_resources.h"
109 #include "chrome/installer/util/google_update_settings.h" 110 #include "chrome/installer/util/google_update_settings.h"
110 #include "components/component_updater/component_updater_service.h" 111 #include "components/component_updater/component_updater_service.h"
111 #include "components/device_event_log/device_event_log.h" 112 #include "components/device_event_log/device_event_log.h"
112 #include "components/google/core/browser/google_util.h" 113 #include "components/google/core/browser/google_util.h"
113 #include "components/language_usage_metrics/language_usage_metrics.h" 114 #include "components/language_usage_metrics/language_usage_metrics.h"
(...skipping 19 matching lines...) Expand all
133 #include "content/public/browser/notification_registrar.h" 134 #include "content/public/browser/notification_registrar.h"
134 #include "content/public/browser/notification_service.h" 135 #include "content/public/browser/notification_service.h"
135 #include "content/public/browser/notification_types.h" 136 #include "content/public/browser/notification_types.h"
136 #include "content/public/browser/power_usage_monitor.h" 137 #include "content/public/browser/power_usage_monitor.h"
137 #include "content/public/browser/site_instance.h" 138 #include "content/public/browser/site_instance.h"
138 #include "content/public/common/content_client.h" 139 #include "content/public/common/content_client.h"
139 #include "content/public/common/content_switches.h" 140 #include "content/public/common/content_switches.h"
140 #include "content/public/common/main_function_params.h" 141 #include "content/public/common/main_function_params.h"
141 #include "grit/platform_locale_settings.h" 142 #include "grit/platform_locale_settings.h"
142 #include "media/audio/audio_manager.h" 143 #include "media/audio/audio_manager.h"
144 #include "media/base/media_resources.h"
143 #include "net/base/net_module.h" 145 #include "net/base/net_module.h"
144 #include "net/cookies/cookie_monster.h" 146 #include "net/cookies/cookie_monster.h"
145 #include "net/http/http_network_layer.h" 147 #include "net/http/http_network_layer.h"
146 #include "net/http/http_stream_factory.h" 148 #include "net/http/http_stream_factory.h"
147 #include "net/url_request/url_request.h" 149 #include "net/url_request/url_request.h"
148 #include "ui/base/l10n/l10n_util.h" 150 #include "ui/base/l10n/l10n_util.h"
149 #include "ui/base/layout.h" 151 #include "ui/base/layout.h"
150 #include "ui/base/resource/resource_bundle.h" 152 #include "ui/base/resource/resource_bundle.h"
151 #include "ui/strings/grit/app_locale_settings.h" 153 #include "ui/strings/grit/app_locale_settings.h"
152 154
(...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 rlz::RLZTracker::InitRlzDelayed( 1521 rlz::RLZTracker::InitRlzDelayed(
1520 first_run::IsChromeFirstRun(), ping_delay < 0, 1522 first_run::IsChromeFirstRun(), ping_delay < 0,
1521 base::TimeDelta::FromMilliseconds(abs(ping_delay)), 1523 base::TimeDelta::FromMilliseconds(abs(ping_delay)),
1522 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_), 1524 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_),
1523 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_), 1525 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_),
1524 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_)); 1526 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_));
1525 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) 1527 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS)
1526 1528
1527 // Configure modules that need access to resources. 1529 // Configure modules that need access to resources.
1528 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); 1530 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
1531 media::SetLocalizedStringProvider(
1532 base::Bind(&chrome_common_media::LocalizedStringProvider));
Nico 2015/09/18 00:48:23 NetResourceProvider doesn't use Bind() – can this
DaleCurtis 2015/09/18 01:00:54 Heh, I recommended he use bind instead, but now we
1529 1533
1530 // In unittest mode, this will do nothing. In normal mode, this will create 1534 // In unittest mode, this will do nothing. In normal mode, this will create
1531 // the global IntranetRedirectDetector instance, which will promptly go to 1535 // the global IntranetRedirectDetector instance, which will promptly go to
1532 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards 1536 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards
1533 // to see if it should do anything else. 1537 // to see if it should do anything else.
1534 // 1538 //
1535 // A simpler way of doing all this would be to have some function which could 1539 // A simpler way of doing all this would be to have some function which could
1536 // give the time elapsed since startup, and simply have this object check that 1540 // give the time elapsed since startup, and simply have this object check that
1537 // when asked to initialize itself, but this doesn't seem to exist. 1541 // when asked to initialize itself, but this doesn't seem to exist.
1538 // 1542 //
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 chromeos::CrosSettings::Shutdown(); 1842 chromeos::CrosSettings::Shutdown();
1839 #endif // defined(OS_CHROMEOS) 1843 #endif // defined(OS_CHROMEOS)
1840 #endif // defined(OS_ANDROID) 1844 #endif // defined(OS_ANDROID)
1841 } 1845 }
1842 1846
1843 // Public members: 1847 // Public members:
1844 1848
1845 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1849 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1846 chrome_extra_parts_.push_back(parts); 1850 chrome_extra_parts_.push_back(parts);
1847 } 1851 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698