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

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

Issue 23945002: file_manager: Move non-binding code to c/b/chromeos/file_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/file_task_executor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 #if defined(ENABLE_WEBRTC) 193 #if defined(ENABLE_WEBRTC)
194 #include "chrome/browser/media/webrtc_logging_handler_host.h" 194 #include "chrome/browser/media/webrtc_logging_handler_host.h"
195 #endif 195 #endif
196 196
197 #if defined(ENABLE_INPUT_SPEECH) 197 #if defined(ENABLE_INPUT_SPEECH)
198 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h" 198 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h"
199 #endif 199 #endif
200 200
201 #if defined(FILE_MANAGER_EXTENSION) 201 #if defined(FILE_MANAGER_EXTENSION)
202 #include "chrome/browser/chromeos/extensions/file_manager/app_id.h" 202 #include "chrome/browser/chromeos/file_manager/app_id.h"
203 #endif 203 #endif
204 204
205 #if defined(TOOLKIT_GTK) 205 #if defined(TOOLKIT_GTK)
206 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" 206 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h"
207 #endif 207 #endif
208 208
209 #if defined(TOOLKIT_VIEWS) 209 #if defined(TOOLKIT_VIEWS)
210 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 210 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
211 #endif 211 #endif
212 212
(...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 #if defined(USE_NSS) 2515 #if defined(USE_NSS)
2516 crypto::CryptoModuleBlockingPasswordDelegate* 2516 crypto::CryptoModuleBlockingPasswordDelegate*
2517 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2517 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2518 const GURL& url) { 2518 const GURL& url) {
2519 return chrome::NewCryptoModuleBlockingDialogDelegate( 2519 return chrome::NewCryptoModuleBlockingDialogDelegate(
2520 chrome::kCryptoModulePasswordKeygen, url.host()); 2520 chrome::kCryptoModulePasswordKeygen, url.host());
2521 } 2521 }
2522 #endif 2522 #endif
2523 2523
2524 } // namespace chrome 2524 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/file_task_executor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698