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

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

Issue 24891002: Initial WebUI extension for enhanced bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use build-time flag to enable Created 7 years, 2 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 browser_context, *url)) 354 browser_context, *url))
355 return false; 355 return false;
356 356
357 #if defined(OS_CHROMEOS) 357 #if defined(OS_CHROMEOS)
358 // Special case : in ChromeOS in Guest mode bookmarks and history are 358 // Special case : in ChromeOS in Guest mode bookmarks and history are
359 // disabled for security reasons. New tab page explains the reasons, so 359 // disabled for security reasons. New tab page explains the reasons, so
360 // we redirect user to new tab page. 360 // we redirect user to new tab page.
361 if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) { 361 if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
362 if (url->SchemeIs(chrome::kChromeUIScheme) && 362 if (url->SchemeIs(chrome::kChromeUIScheme) &&
363 (url->DomainIs(chrome::kChromeUIBookmarksHost) || 363 (url->DomainIs(chrome::kChromeUIBookmarksHost) ||
364 #if defined(ENABLE_ENHANCED_BOOKMARKS)
365 url->DomainIs(chrome::kChromeUIEnhancedBookmarksHost) ||
366 #endif
364 url->DomainIs(chrome::kChromeUIHistoryHost))) { 367 url->DomainIs(chrome::kChromeUIHistoryHost))) {
365 // Rewrite with new tab URL 368 // Rewrite with new tab URL
366 *url = GURL(chrome::kChromeUINewTabURL); 369 *url = GURL(chrome::kChromeUINewTabURL);
367 } 370 }
368 } 371 }
369 #endif 372 #endif
370 373
371 // Special case the new tab page. In older versions of Chrome, the new tab 374 // Special case the new tab page. In older versions of Chrome, the new tab
372 // page was hosted at chrome-internal:<blah>. This might be in people's saved 375 // page was hosted at chrome-internal:<blah>. This might be in people's saved
373 // sessions or bookmarks, so we say any URL with that scheme triggers the new 376 // sessions or bookmarks, so we say any URL with that scheme triggers the new
(...skipping 2172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2546 #if defined(USE_NSS) 2549 #if defined(USE_NSS)
2547 crypto::CryptoModuleBlockingPasswordDelegate* 2550 crypto::CryptoModuleBlockingPasswordDelegate*
2548 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2551 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2549 const GURL& url) { 2552 const GURL& url) {
2550 return chrome::NewCryptoModuleBlockingDialogDelegate( 2553 return chrome::NewCryptoModuleBlockingDialogDelegate(
2551 chrome::kCryptoModulePasswordKeygen, url.host()); 2554 chrome::kCryptoModulePasswordKeygen, url.host());
2552 } 2555 }
2553 #endif 2556 #endif
2554 2557
2555 } // namespace chrome 2558 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698