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

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

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 command_line->AppendSwitch( 1102 command_line->AppendSwitch(
1103 switches::kDisableClientSidePhishingDetection); 1103 switches::kDisableClientSidePhishingDetection);
1104 } 1104 }
1105 1105
1106 if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled)) 1106 if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1107 command_line->AppendSwitch(switches::kRendererPrintPreview); 1107 command_line->AppendSwitch(switches::kRendererPrintPreview);
1108 1108
1109 InstantService* instant_service = 1109 InstantService* instant_service =
1110 InstantServiceFactory::GetForProfile(profile); 1110 InstantServiceFactory::GetForProfile(profile);
1111 if (instant_service && 1111 if (instant_service &&
1112 instant_service->IsInstantProcess(process->GetID())) 1112 instant_service->IsInstantProcess(process->GetID())) {
1113 command_line->AppendSwitch(switches::kInstantProcess); 1113 command_line->AppendSwitch(switches::kInstantProcess);
1114 if (chrome::search::IsInstantExtendedAPIEnabled(profile))
1115 command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
1116 }
1114 } 1117 }
1115 1118
1116 if (content::IsThreadedCompositingEnabled()) 1119 if (content::IsThreadedCompositingEnabled())
1117 command_line->AppendSwitch(switches::kEnableThreadedCompositing); 1120 command_line->AppendSwitch(switches::kEnableThreadedCompositing);
1118 1121
1119 // Please keep this in alphabetical order. 1122 // Please keep this in alphabetical order.
1120 static const char* const kSwitchNames[] = { 1123 static const char* const kSwitchNames[] = {
1121 switches::kAllowHTTPBackgroundPage, 1124 switches::kAllowHTTPBackgroundPage,
1122 switches::kAllowLegacyExtensionManifests, 1125 switches::kAllowLegacyExtensionManifests,
1123 switches::kAllowScriptingGallery, 1126 switches::kAllowScriptingGallery,
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
2095 io_thread_application_locale_ = locale; 2098 io_thread_application_locale_ = locale;
2096 } 2099 }
2097 2100
2098 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2101 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2099 const std::string& locale) { 2102 const std::string& locale) {
2100 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2103 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2101 io_thread_application_locale_ = locale; 2104 io_thread_application_locale_ = locale;
2102 } 2105 }
2103 2106
2104 } // namespace chrome 2107 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698