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

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

Issue 17167006: move sync_promo_ui to non-webui-specific directory (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed include guard on moved file Created 7 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run.cc » ('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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 71 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
72 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 72 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
73 #include "chrome/browser/speech/tts_message_filter.h" 73 #include "chrome/browser/speech/tts_message_filter.h"
74 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 74 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
75 #include "chrome/browser/ssl/ssl_add_certificate.h" 75 #include "chrome/browser/ssl/ssl_add_certificate.h"
76 #include "chrome/browser/ssl/ssl_blocking_page.h" 76 #include "chrome/browser/ssl/ssl_blocking_page.h"
77 #include "chrome/browser/ssl/ssl_tab_helper.h" 77 #include "chrome/browser/ssl/ssl_tab_helper.h"
78 #include "chrome/browser/tab_contents/tab_util.h" 78 #include "chrome/browser/tab_contents/tab_util.h"
79 #include "chrome/browser/toolkit_extra_parts.h" 79 #include "chrome/browser/toolkit_extra_parts.h"
80 #include "chrome/browser/ui/chrome_select_file_policy.h" 80 #include "chrome/browser/ui/chrome_select_file_policy.h"
81 #include "chrome/browser/ui/sync/sync_promo_ui.h"
81 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 82 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
82 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 83 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
83 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
84 #include "chrome/browser/user_style_sheet_watcher.h" 84 #include "chrome/browser/user_style_sheet_watcher.h"
85 #include "chrome/browser/user_style_sheet_watcher_factory.h" 85 #include "chrome/browser/user_style_sheet_watcher_factory.h"
86 #include "chrome/browser/validation_message_message_filter.h" 86 #include "chrome/browser/validation_message_message_filter.h"
87 #include "chrome/browser/webview/webview_guest.h" 87 #include "chrome/browser/webview/webview_guest.h"
88 #include "chrome/common/child_process_logging.h" 88 #include "chrome/common/child_process_logging.h"
89 #include "chrome/common/chrome_constants.h" 89 #include "chrome/common/chrome_constants.h"
90 #include "chrome/common/chrome_paths.h" 90 #include "chrome/common/chrome_paths.h"
91 #include "chrome/common/chrome_process_type.h" 91 #include "chrome/common/chrome_process_type.h"
92 #include "chrome/common/chrome_switches.h" 92 #include "chrome/common/chrome_switches.h"
93 #include "chrome/common/extensions/background_info.h" 93 #include "chrome/common/extensions/background_info.h"
(...skipping 2252 matching lines...) Expand 10 before | Expand all | Expand 10 after
2346 #if defined(USE_NSS) 2346 #if defined(USE_NSS)
2347 crypto::CryptoModuleBlockingPasswordDelegate* 2347 crypto::CryptoModuleBlockingPasswordDelegate*
2348 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2348 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2349 const GURL& url) { 2349 const GURL& url) {
2350 return chrome::NewCryptoModuleBlockingDialogDelegate( 2350 return chrome::NewCryptoModuleBlockingDialogDelegate(
2351 chrome::kCryptoModulePasswordKeygen, url.host()); 2351 chrome::kCryptoModulePasswordKeygen, url.host());
2352 } 2352 }
2353 #endif 2353 #endif
2354 2354
2355 } // namespace chrome 2355 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698