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

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

Issue 23729005: Enable Activity Logging by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added definition of 'active' Created 7 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 | Annotate | Revision Log
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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/browsing_data/browsing_data_remover.h" 25 #include "chrome/browser/browsing_data/browsing_data_remover.h"
26 #include "chrome/browser/character_encoding.h" 26 #include "chrome/browser/character_encoding.h"
27 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 27 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
28 #include "chrome/browser/chrome_quota_permission_context.h" 28 #include "chrome/browser/chrome_quota_permission_context.h"
29 #include "chrome/browser/content_settings/content_settings_utils.h" 29 #include "chrome/browser/content_settings/content_settings_utils.h"
30 #include "chrome/browser/content_settings/cookie_settings.h" 30 #include "chrome/browser/content_settings/cookie_settings.h"
31 #include "chrome/browser/content_settings/host_content_settings_map.h" 31 #include "chrome/browser/content_settings/host_content_settings_map.h"
32 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 32 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
33 #include "chrome/browser/defaults.h" 33 #include "chrome/browser/defaults.h"
34 #include "chrome/browser/download/download_prefs.h" 34 #include "chrome/browser/download/download_prefs.h"
35 #include "chrome/browser/extensions/activity_log/activity_log.h"
36 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 35 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
37 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h" 36 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
38 #include "chrome/browser/extensions/extension_host.h" 37 #include "chrome/browser/extensions/extension_host.h"
39 #include "chrome/browser/extensions/extension_info_map.h" 38 #include "chrome/browser/extensions/extension_info_map.h"
40 #include "chrome/browser/extensions/extension_process_manager.h" 39 #include "chrome/browser/extensions/extension_process_manager.h"
41 #include "chrome/browser/extensions/extension_service.h" 40 #include "chrome/browser/extensions/extension_service.h"
42 #include "chrome/browser/extensions/extension_system.h" 41 #include "chrome/browser/extensions/extension_system.h"
43 #include "chrome/browser/extensions/extension_web_ui.h" 42 #include "chrome/browser/extensions/extension_web_ui.h"
44 #include "chrome/browser/extensions/extension_webkit_preferences.h" 43 #include "chrome/browser/extensions/extension_webkit_preferences.h"
45 #include "chrome/browser/extensions/suggest_permission_util.h" 44 #include "chrome/browser/extensions/suggest_permission_util.h"
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 extensions::ExtensionSystem::Get(profile)->info_map(); 886 extensions::ExtensionSystem::Get(profile)->info_map();
888 host->GetChannel()->AddFilter(new NaClHostMessageFilter( 887 host->GetChannel()->AddFilter(new NaClHostMessageFilter(
889 id, profile->IsOffTheRecord(), 888 id, profile->IsOffTheRecord(),
890 profile->GetPath(), extension_info_map, 889 profile->GetPath(), extension_info_map,
891 context)); 890 context));
892 #endif 891 #endif
893 892
894 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 893 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
895 profile->IsOffTheRecord())); 894 profile->IsOffTheRecord()));
896 895
897 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
898 extensions::ActivityLog::GetInstance(profile)->IsLogEnabled()));
899
900 SendExtensionWebRequestStatusToHost(host); 896 SendExtensionWebRequestStatusToHost(host);
901 897
902 RendererContentSettingRules rules; 898 RendererContentSettingRules rules;
903 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); 899 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
904 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); 900 host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
905 } 901 }
906 902
907 GURL ChromeContentBrowserClient::GetEffectiveURL( 903 GURL ChromeContentBrowserClient::GetEffectiveURL(
908 content::BrowserContext* browser_context, const GURL& url) { 904 content::BrowserContext* browser_context, const GURL& url) {
909 Profile* profile = Profile::FromBrowserContext(browser_context); 905 Profile* profile = Profile::FromBrowserContext(browser_context);
(...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after
2517 #if defined(USE_NSS) 2513 #if defined(USE_NSS)
2518 crypto::CryptoModuleBlockingPasswordDelegate* 2514 crypto::CryptoModuleBlockingPasswordDelegate*
2519 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2515 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2520 const GURL& url) { 2516 const GURL& url) {
2521 return chrome::NewCryptoModuleBlockingDialogDelegate( 2517 return chrome::NewCryptoModuleBlockingDialogDelegate(
2522 chrome::kCryptoModulePasswordKeygen, url.host()); 2518 chrome::kCryptoModulePasswordKeygen, url.host());
2523 } 2519 }
2524 #endif 2520 #endif
2525 2521
2526 } // namespace chrome 2522 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698