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

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

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 64 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
65 #include "chrome/browser/search_engines/template_url_service.h" 65 #include "chrome/browser/search_engines/template_url_service.h"
66 #include "chrome/browser/search_engines/template_url_service_factory.h" 66 #include "chrome/browser/search_engines/template_url_service_factory.h"
67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
68 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 68 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
69 #include "chrome/browser/ssl/ssl_add_certificate.h" 69 #include "chrome/browser/ssl/ssl_add_certificate.h"
70 #include "chrome/browser/ssl/ssl_blocking_page.h" 70 #include "chrome/browser/ssl/ssl_blocking_page.h"
71 #include "chrome/browser/ssl/ssl_tab_helper.h" 71 #include "chrome/browser/ssl/ssl_tab_helper.h"
72 #include "chrome/browser/tab_contents/tab_util.h" 72 #include "chrome/browser/tab_contents/tab_util.h"
73 #include "chrome/browser/toolkit_extra_parts.h" 73 #include "chrome/browser/toolkit_extra_parts.h"
74 #include "chrome/browser/ui/chrome_select_file_policy.h"
75 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 74 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
76 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 75 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
77 #include "chrome/browser/user_style_sheet_watcher.h" 76 #include "chrome/browser/user_style_sheet_watcher.h"
78 #include "chrome/browser/user_style_sheet_watcher_factory.h" 77 #include "chrome/browser/user_style_sheet_watcher_factory.h"
79 #include "chrome/browser/view_type_utils.h" 78 #include "chrome/browser/view_type_utils.h"
80 #include "chrome/common/child_process_logging.h" 79 #include "chrome/common/child_process_logging.h"
81 #include "chrome/common/chrome_constants.h" 80 #include "chrome/common/chrome_constants.h"
82 #include "chrome/common/chrome_paths.h" 81 #include "chrome/common/chrome_paths.h"
83 #include "chrome/common/chrome_switches.h" 82 #include "chrome/common/chrome_switches.h"
84 #include "chrome/common/extensions/extension.h" 83 #include "chrome/common/extensions/extension.h"
(...skipping 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1930 1929
1931 return false; 1930 return false;
1932 } 1931 }
1933 1932
1934 FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() { 1933 FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() {
1935 FilePath directory; 1934 FilePath directory;
1936 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); 1935 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory);
1937 return directory.Append(FILE_PATH_LITERAL("Hyphen")); 1936 return directory.Append(FILE_PATH_LITERAL("Hyphen"));
1938 } 1937 }
1939 1938
1940 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
1941 WebContents* web_contents) {
1942 return new ChromeSelectFilePolicy(web_contents);
1943 }
1944
1945 #if defined(OS_POSIX) && !defined(OS_MACOSX) 1939 #if defined(OS_POSIX) && !defined(OS_MACOSX)
1946 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 1940 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
1947 const CommandLine& command_line, 1941 const CommandLine& command_line,
1948 int child_process_id, 1942 int child_process_id,
1949 std::vector<FileDescriptorInfo>* mappings) { 1943 std::vector<FileDescriptorInfo>* mappings) {
1950 #if defined(OS_ANDROID) 1944 #if defined(OS_ANDROID)
1951 FilePath data_path; 1945 FilePath data_path;
1952 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 1946 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
1953 DCHECK(!data_path.empty()); 1947 DCHECK(!data_path.empty());
1954 1948
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
2040 io_thread_application_locale_ = locale; 2034 io_thread_application_locale_ = locale;
2041 } 2035 }
2042 2036
2043 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2037 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2044 const std::string& locale) { 2038 const std::string& locale) {
2045 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2039 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2046 io_thread_application_locale_ = locale; 2040 io_thread_application_locale_ = locale;
2047 } 2041 }
2048 2042
2049 } // namespace chrome 2043 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698