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

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

Issue 7068034: Remove the last prefs code from content. I tried hard to move ShouldShowBookmarkBar out of TabCo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/breakpad_mac.h" 8 #include "chrome/app/breakpad_mac.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/character_encoding.h" 10 #include "chrome/browser/character_encoding.h"
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // in the browser process. 226 // in the browser process.
227 if (!g_browser_process->safe_browsing_detection_service()) 227 if (!g_browser_process->safe_browsing_detection_service())
228 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); 228 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection);
229 } 229 }
230 } 230 }
231 231
232 std::string ChromeContentBrowserClient::GetApplicationLocale() { 232 std::string ChromeContentBrowserClient::GetApplicationLocale() {
233 return g_browser_process->GetApplicationLocale(); 233 return g_browser_process->GetApplicationLocale();
234 } 234 }
235 235
236 std::string ChromeContentBrowserClient::GetAcceptLangs(const TabContents* tab) {
237 return tab->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
238 }
239
236 bool ChromeContentBrowserClient::AllowAppCache( 240 bool ChromeContentBrowserClient::AllowAppCache(
237 const GURL& manifest_url, const content::ResourceContext& context) { 241 const GURL& manifest_url, const content::ResourceContext& context) {
238 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 242 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
239 ProfileIOData* io_data = 243 ProfileIOData* io_data =
240 reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL)); 244 reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
241 ContentSetting setting = io_data->GetHostContentSettingsMap()-> 245 ContentSetting setting = io_data->GetHostContentSettingsMap()->
242 GetContentSetting(manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, ""); 246 GetContentSetting(manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
243 DCHECK(setting != CONTENT_SETTING_DEFAULT); 247 DCHECK(setting != CONTENT_SETTING_DEFAULT);
244 return setting != CONTENT_SETTING_BLOCK; 248 return setting != CONTENT_SETTING_BLOCK;
245 } 249 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket(); 342 return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
339 343
340 if (process_type == switches::kGpuProcess) 344 if (process_type == switches::kGpuProcess)
341 return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket(); 345 return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
342 346
343 return -1; 347 return -1;
344 } 348 }
345 #endif 349 #endif
346 350
347 } // namespace chrome 351 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698