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

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1673 CookieSettings* cookie_settings = io_data->GetCookieSettings(); 1673 CookieSettings* cookie_settings = io_data->GetCookieSettings();
1674 ContentSetting setting = cookie_settings->GetDefaultCookieSetting(NULL); 1674 ContentSetting setting = cookie_settings->GetDefaultCookieSetting(NULL);
1675 1675
1676 // TODO(bauerb): Should we also disallow local state if the default is BLOCK? 1676 // TODO(bauerb): Should we also disallow local state if the default is BLOCK?
1677 // Could we even support per-origin settings? 1677 // Could we even support per-origin settings?
1678 return setting != CONTENT_SETTING_SESSION_ONLY; 1678 return setting != CONTENT_SETTING_SESSION_ONLY;
1679 } 1679 }
1680 1680
1681 bool ChromeContentBrowserClient::AllowWorkerDatabase( 1681 bool ChromeContentBrowserClient::AllowWorkerDatabase(
1682 const GURL& url, 1682 const GURL& url,
1683 const string16& name, 1683 const base::string16& name,
1684 const string16& display_name, 1684 const base::string16& display_name,
1685 unsigned long estimated_size, 1685 unsigned long estimated_size,
1686 content::ResourceContext* context, 1686 content::ResourceContext* context,
1687 const std::vector<std::pair<int, int> >& render_views) { 1687 const std::vector<std::pair<int, int> >& render_views) {
1688 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1688 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1689 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 1689 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
1690 CookieSettings* cookie_settings = io_data->GetCookieSettings(); 1690 CookieSettings* cookie_settings = io_data->GetCookieSettings();
1691 bool allow = cookie_settings->IsSettingCookieAllowed(url, url); 1691 bool allow = cookie_settings->IsSettingCookieAllowed(url, url);
1692 1692
1693 // Record access to database for potential display in UI. 1693 // Record access to database for potential display in UI.
1694 std::vector<std::pair<int, int> >::const_iterator i; 1694 std::vector<std::pair<int, int> >::const_iterator i;
(...skipping 23 matching lines...) Expand all
1718 BrowserThread::UI, FROM_HERE, 1718 BrowserThread::UI, FROM_HERE,
1719 base::Bind(&TabSpecificContentSettings::FileSystemAccessed, 1719 base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
1720 i->first, i->second, url, !allow)); 1720 i->first, i->second, url, !allow));
1721 } 1721 }
1722 1722
1723 return allow; 1723 return allow;
1724 } 1724 }
1725 1725
1726 bool ChromeContentBrowserClient::AllowWorkerIndexedDB( 1726 bool ChromeContentBrowserClient::AllowWorkerIndexedDB(
1727 const GURL& url, 1727 const GURL& url,
1728 const string16& name, 1728 const base::string16& name,
1729 content::ResourceContext* context, 1729 content::ResourceContext* context,
1730 const std::vector<std::pair<int, int> >& render_views) { 1730 const std::vector<std::pair<int, int> >& render_views) {
1731 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1731 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1732 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 1732 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
1733 CookieSettings* cookie_settings = io_data->GetCookieSettings(); 1733 CookieSettings* cookie_settings = io_data->GetCookieSettings();
1734 bool allow = cookie_settings->IsSettingCookieAllowed(url, url); 1734 bool allow = cookie_settings->IsSettingCookieAllowed(url, url);
1735 1735
1736 // Record access to IndexedDB for potential display in UI. 1736 // Record access to IndexedDB for potential display in UI.
1737 std::vector<std::pair<int, int> >::const_iterator i; 1737 std::vector<std::pair<int, int> >::const_iterator i;
1738 for (i = render_views.begin(); i != render_views.end(); ++i) { 1738 for (i = render_views.begin(); i != render_views.end(); ++i) {
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
2644 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, 2644 return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
2645 allowed_file_handle_origins_) || 2645 allowed_file_handle_origins_) ||
2646 IsHostAllowedByCommandLine(url, extension_set, 2646 IsHostAllowedByCommandLine(url, extension_set,
2647 switches::kAllowNaClFileHandleAPI); 2647 switches::kAllowNaClFileHandleAPI);
2648 #else 2648 #else
2649 return false; 2649 return false;
2650 #endif 2650 #endif
2651 } 2651 }
2652 2652
2653 } // namespace chrome 2653 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698