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

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

Issue 2943983003: chrome/blink: Add functionality for in-product help for media elements. (Closed)
Patch Set: Created 3 years, 6 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_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 #include "components/cdm/browser/cdm_message_filter_android.h" 128 #include "components/cdm/browser/cdm_message_filter_android.h"
129 #include "components/cloud_devices/common/cloud_devices_switches.h" 129 #include "components/cloud_devices/common/cloud_devices_switches.h"
130 #include "components/content_settings/core/browser/content_settings_utils.h" 130 #include "components/content_settings/core/browser/content_settings_utils.h"
131 #include "components/content_settings/core/browser/cookie_settings.h" 131 #include "components/content_settings/core/browser/cookie_settings.h"
132 #include "components/content_settings/core/browser/host_content_settings_map.h" 132 #include "components/content_settings/core/browser/host_content_settings_map.h"
133 #include "components/content_settings/core/common/content_settings.h" 133 #include "components/content_settings/core/common/content_settings.h"
134 #include "components/content_settings/core/common/content_settings_types.h" 134 #include "components/content_settings/core/common/content_settings_types.h"
135 #include "components/dom_distiller/core/dom_distiller_switches.h" 135 #include "components/dom_distiller/core/dom_distiller_switches.h"
136 #include "components/dom_distiller/core/url_constants.h" 136 #include "components/dom_distiller/core/url_constants.h"
137 #include "components/error_page/common/error_page_switches.h" 137 #include "components/error_page/common/error_page_switches.h"
138 #include "components/feature_engagement_tracker/public/feature_constants.h"
139 #include "components/feature_engagement_tracker/public/feature_list.h"
138 #include "components/google/core/browser/google_util.h" 140 #include "components/google/core/browser/google_util.h"
139 #include "components/metrics/call_stack_profile_collector.h" 141 #include "components/metrics/call_stack_profile_collector.h"
140 #include "components/metrics/client_info.h" 142 #include "components/metrics/client_info.h"
141 #include "components/nacl/common/nacl_constants.h" 143 #include "components/nacl/common/nacl_constants.h"
142 #include "components/net_log/chrome_net_log.h" 144 #include "components/net_log/chrome_net_log.h"
143 #include "components/password_manager/content/browser/content_password_manager_d river_factory.h" 145 #include "components/password_manager/content/browser/content_password_manager_d river_factory.h"
144 #include "components/pref_registry/pref_registry_syncable.h" 146 #include "components/pref_registry/pref_registry_syncable.h"
145 #include "components/prefs/pref_service.h" 147 #include "components/prefs/pref_service.h"
146 #include "components/prefs/scoped_user_pref_update.h" 148 #include "components/prefs/scoped_user_pref_update.h"
147 #include "components/rappor/public/rappor_utils.h" 149 #include "components/rappor/public/rappor_utils.h"
(...skipping 1755 matching lines...) Expand 10 before | Expand all | Expand 10 after
1903 DCHECK(command_line->HasSwitch(switches::kEnableStatsTable)); 1905 DCHECK(command_line->HasSwitch(switches::kEnableStatsTable));
1904 1906
1905 StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( 1907 StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
1906 process_type, 1908 process_type,
1907 command_line); 1909 command_line);
1908 1910
1909 if (process_type == switches::kRendererProcess) { 1911 if (process_type == switches::kRendererProcess) {
1910 task_scheduler_util::AddVariationParamsToCommandLine("Renderer", 1912 task_scheduler_util::AddVariationParamsToCommandLine("Renderer",
1911 command_line); 1913 command_line);
1912 } 1914 }
1915
1916 if (process_type == switches::kRendererProcess &&
1917 base::FeatureList::IsEnabled(
1918 feature_engagement_tracker::kIPHMediaDownloadFeature)) {
1919 LOG(ERROR) << "Appending SWITCH FOR RENDEREREREREREFFBKEIVFBOUE";
1920 command_line->AppendSwitch(
1921 feature_engagement_tracker::kEnableMediaDownloadIPH);
1922 }
1913 } 1923 }
1914 1924
1915 std::string ChromeContentBrowserClient::GetApplicationLocale() { 1925 std::string ChromeContentBrowserClient::GetApplicationLocale() {
1916 if (BrowserThread::CurrentlyOn(BrowserThread::IO)) 1926 if (BrowserThread::CurrentlyOn(BrowserThread::IO))
1917 return g_io_thread_application_locale.Get(); 1927 return g_io_thread_application_locale.Get();
1918 return g_browser_process->GetApplicationLocale(); 1928 return g_browser_process->GetApplicationLocale();
1919 } 1929 }
1920 1930
1921 std::string ChromeContentBrowserClient::GetAcceptLangs( 1931 std::string ChromeContentBrowserClient::GetAcceptLangs(
1922 content::BrowserContext* context) { 1932 content::BrowserContext* context) {
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after
3431 3441
3432 base::FilePath ChromeContentBrowserClient::GetLoggingFileName() { 3442 base::FilePath ChromeContentBrowserClient::GetLoggingFileName() {
3433 return logging::GetLogFileName(); 3443 return logging::GetLogFileName();
3434 } 3444 }
3435 3445
3436 // static 3446 // static
3437 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3447 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3438 const storage::QuotaSettings* settings) { 3448 const storage::QuotaSettings* settings) {
3439 g_default_quota_settings = settings; 3449 g_default_quota_settings = settings;
3440 } 3450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698