OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
(...skipping 1111 matching lines...) Loading... |
1123 command_line->AppendSwitch( | 1123 command_line->AppendSwitch( |
1124 switches::kDisableClientSidePhishingDetection); | 1124 switches::kDisableClientSidePhishingDetection); |
1125 } | 1125 } |
1126 | 1126 |
1127 if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled)) | 1127 if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled)) |
1128 command_line->AppendSwitch(switches::kRendererPrintPreview); | 1128 command_line->AppendSwitch(switches::kRendererPrintPreview); |
1129 | 1129 |
1130 InstantService* instant_service = | 1130 InstantService* instant_service = |
1131 InstantServiceFactory::GetForProfile(profile); | 1131 InstantServiceFactory::GetForProfile(profile); |
1132 if (instant_service && | 1132 if (instant_service && |
1133 instant_service->IsInstantProcess(process->GetID())) | 1133 instant_service->IsInstantProcess(process->GetID())) { |
1134 command_line->AppendSwitch(switches::kInstantProcess); | 1134 command_line->AppendSwitch(switches::kInstantProcess); |
| 1135 if (chrome::search::IsInstantExtendedAPIEnabled()) |
| 1136 command_line->AppendSwitch(switches::kEnableInstantExtendedAPI); |
| 1137 } |
1135 | 1138 |
1136 SigninManager* signin_manager = | 1139 SigninManager* signin_manager = |
1137 SigninManagerFactory::GetForProfile(profile); | 1140 SigninManagerFactory::GetForProfile(profile); |
1138 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) | 1141 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) |
1139 command_line->AppendSwitch(switches::kSigninProcess); | 1142 command_line->AppendSwitch(switches::kSigninProcess); |
1140 } | 1143 } |
1141 | 1144 |
1142 if (content::IsThreadedCompositingEnabled()) | 1145 if (content::IsThreadedCompositingEnabled()) |
1143 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 1146 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
1144 | 1147 |
(...skipping 976 matching lines...) Loading... |
2121 io_thread_application_locale_ = locale; | 2124 io_thread_application_locale_ = locale; |
2122 } | 2125 } |
2123 | 2126 |
2124 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 2127 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
2125 const std::string& locale) { | 2128 const std::string& locale) { |
2126 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 2129 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
2127 io_thread_application_locale_ = locale; | 2130 io_thread_application_locale_ = locale; |
2128 } | 2131 } |
2129 | 2132 |
2130 } // namespace chrome | 2133 } // namespace chrome |
OLD | NEW |