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

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

Issue 12326168: Move <webview> API to chrome layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT Created 7 years, 9 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/chrome_content_browser_client.h ('k') | chrome/chrome_browser.gypi » ('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_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
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string_tokenizer.h" 15 #include "base/strings/string_tokenizer.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/app/breakpad_mac.h" 17 #include "chrome/app/breakpad_mac.h"
18 #include "chrome/browser/browser_about_handler.h" 18 #include "chrome/browser/browser_about_handler.h"
19 #include "chrome/browser/browser_plugin/chrome_browser_plugin_guest_observer.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/browsing_data/browsing_data_helper.h" 21 #include "chrome/browser/browsing_data/browsing_data_helper.h"
21 #include "chrome/browser/browsing_data/browsing_data_remover.h" 22 #include "chrome/browser/browsing_data/browsing_data_remover.h"
22 #include "chrome/browser/character_encoding.h" 23 #include "chrome/browser/character_encoding.h"
23 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 24 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
24 #include "chrome/browser/chrome_quota_permission_context.h" 25 #include "chrome/browser/chrome_quota_permission_context.h"
25 #include "chrome/browser/content_settings/content_settings_utils.h" 26 #include "chrome/browser/content_settings/content_settings_utils.h"
26 #include "chrome/browser/content_settings/cookie_settings.h" 27 #include "chrome/browser/content_settings/cookie_settings.h"
27 #include "chrome/browser/content_settings/host_content_settings_map.h" 28 #include "chrome/browser/content_settings/host_content_settings_map.h"
28 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 29 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 1032
1032 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect( 1033 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(
1033 content::ResourceContext* resource_context, const GURL& current_url, 1034 content::ResourceContext* resource_context, const GURL& current_url,
1034 const GURL& new_url) { 1035 const GURL& new_url) {
1035 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 1036 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
1036 return extensions::CrossesExtensionProcessBoundary( 1037 return extensions::CrossesExtensionProcessBoundary(
1037 io_data->GetExtensionInfoMap()->extensions(), 1038 io_data->GetExtensionInfoMap()->extensions(),
1038 ExtensionURLInfo(current_url), ExtensionURLInfo(new_url), false); 1039 ExtensionURLInfo(current_url), ExtensionURLInfo(new_url), false);
1039 } 1040 }
1040 1041
1042 void ChromeContentBrowserClient::BrowserPluginGuestCreated(
1043 content::BrowserPluginGuest* guest) {
1044 new ChromeBrowserPluginGuestObserver(guest);
1045 }
1046
1041 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( 1047 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
1042 const std::string& alias_name) { 1048 const std::string& alias_name) {
1043 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name); 1049 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name);
1044 } 1050 }
1045 1051
1046 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( 1052 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
1047 CommandLine* command_line, int child_process_id) { 1053 CommandLine* command_line, int child_process_id) {
1048 #if defined(USE_LINUX_BREAKPAD) 1054 #if defined(USE_LINUX_BREAKPAD)
1049 if (IsCrashReporterEnabled()) { 1055 if (IsCrashReporterEnabled()) {
1050 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, 1056 command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 io_thread_application_locale_ = locale; 2102 io_thread_application_locale_ = locale;
2097 } 2103 }
2098 2104
2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2105 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2100 const std::string& locale) { 2106 const std::string& locale) {
2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2107 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2102 io_thread_application_locale_ = locale; 2108 io_thread_application_locale_ = locale;
2103 } 2109 }
2104 2110
2105 } // namespace chrome 2111 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698