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

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

Issue 8997008: Move AccessTokenStore to Content API, now that it is a pure-virtual class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head (pure merge). Created 9 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) 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 <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 #if defined(USE_AURA) 128 #if defined(USE_AURA)
129 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 129 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
130 #elif defined(OS_WIN) 130 #elif defined(OS_WIN)
131 #include "content/browser/renderer_host/render_widget_host_view_win.h" 131 #include "content/browser/renderer_host/render_widget_host_view_win.h"
132 #elif defined(TOOLKIT_USES_GTK) 132 #elif defined(TOOLKIT_USES_GTK)
133 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" 133 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
134 #elif defined(OS_MACOSX) 134 #elif defined(OS_MACOSX)
135 #include "content/browser/renderer_host/render_widget_host_view_mac.h" 135 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
136 #endif 136 #endif
137 137
138 using content::AccessTokenStore;
138 using content::BrowserThread; 139 using content::BrowserThread;
139 140
140 namespace { 141 namespace {
141 142
142 // Handles rewriting Web UI URLs. 143 // Handles rewriting Web UI URLs.
143 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) { 144 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
144 if (!ChromeWebUIFactory::GetInstance()->UseWebUIForURL(browser_context, *url)) 145 if (!ChromeWebUIFactory::GetInstance()->UseWebUIForURL(browser_context, *url))
145 return false; 146 return false;
146 147
147 // Special case the new tab page. In older versions of Chrome, the new tab 148 // Special case the new tab page. In older versions of Chrome, the new tab
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 #if defined(USE_NSS) 1222 #if defined(USE_NSS)
1222 crypto::CryptoModuleBlockingPasswordDelegate* 1223 crypto::CryptoModuleBlockingPasswordDelegate*
1223 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1224 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1224 const GURL& url) { 1225 const GURL& url) {
1225 return browser::NewCryptoModuleBlockingDialogDelegate( 1226 return browser::NewCryptoModuleBlockingDialogDelegate(
1226 browser::kCryptoModulePasswordKeygen, url.host()); 1227 browser::kCryptoModulePasswordKeygen, url.host());
1227 } 1228 }
1228 #endif 1229 #endif
1229 1230
1230 } // namespace chrome 1231 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/geolocation/access_token_store_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698