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

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

Issue 16206002: Add more support for FreeBSD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 3 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
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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 #elif defined(OS_ANDROID) 162 #elif defined(OS_ANDROID)
163 #include "chrome/browser/android/crash_dump_manager.h" 163 #include "chrome/browser/android/crash_dump_manager.h"
164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
165 #include "chrome/browser/chrome_browser_main_android.h" 165 #include "chrome/browser/chrome_browser_main_android.h"
166 #include "chrome/browser/media/encrypted_media_message_filter_android.h" 166 #include "chrome/browser/media/encrypted_media_message_filter_android.h"
167 #include "chrome/common/descriptors_android.h" 167 #include "chrome/common/descriptors_android.h"
168 #elif defined(OS_POSIX) 168 #elif defined(OS_POSIX)
169 #include "chrome/browser/chrome_browser_main_posix.h" 169 #include "chrome/browser/chrome_browser_main_posix.h"
170 #endif 170 #endif
171 171
172 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) 172 #if defined(OS_POSIX) && !defined(OS_MACOSX)
173 #include "base/linux_util.h" 173 #include "base/linux_util.h"
174 #include "chrome/browser/crash_handler_host_linux.h" 174 #include "chrome/browser/crash_handler_host_linux.h"
175 #endif 175 #endif
176 176
177 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 177 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
178 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 178 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
179 #endif 179 #endif
180 180
181 #if defined(OS_ANDROID) 181 #if defined(OS_ANDROID)
182 #include "ui/base/ui_base_paths.h" 182 #include "ui/base/ui_base_paths.h"
(...skipping 2343 matching lines...) Expand 10 before | Expand all | Expand 10 after
2526 #if defined(USE_NSS) 2526 #if defined(USE_NSS)
2527 crypto::CryptoModuleBlockingPasswordDelegate* 2527 crypto::CryptoModuleBlockingPasswordDelegate*
2528 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2528 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2529 const GURL& url) { 2529 const GURL& url) {
2530 return chrome::NewCryptoModuleBlockingDialogDelegate( 2530 return chrome::NewCryptoModuleBlockingDialogDelegate(
2531 chrome::kCryptoModulePasswordKeygen, url.host()); 2531 chrome::kCryptoModulePasswordKeygen, url.host());
2532 } 2532 }
2533 #endif 2533 #endif
2534 2534
2535 } // namespace chrome 2535 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698