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

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

Issue 1385663002: [Contextual Search] Add Mojo-enabled API component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a Finch flag required to enable this feature. Created 5 years, 2 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
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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/prerender/prerender_manager_factory.h" 54 #include "chrome/browser/prerender/prerender_manager_factory.h"
55 #include "chrome/browser/prerender/prerender_message_filter.h" 55 #include "chrome/browser/prerender/prerender_message_filter.h"
56 #include "chrome/browser/printing/printing_message_filter.h" 56 #include "chrome/browser/printing/printing_message_filter.h"
57 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 57 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
58 #include "chrome/browser/profiles/profile.h" 58 #include "chrome/browser/profiles/profile.h"
59 #include "chrome/browser/profiles/profile_io_data.h" 59 #include "chrome/browser/profiles/profile_io_data.h"
60 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 60 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
61 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 61 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
62 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 62 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
63 #include "chrome/browser/safe_browsing/ui_manager.h" 63 #include "chrome/browser/safe_browsing/ui_manager.h"
64 #include "chrome/browser/search/contextual_search_service.h"
64 #include "chrome/browser/search/instant_service.h" 65 #include "chrome/browser/search/instant_service.h"
65 #include "chrome/browser/search/instant_service_factory.h" 66 #include "chrome/browser/search/instant_service_factory.h"
66 #include "chrome/browser/search/search.h" 67 #include "chrome/browser/search/search.h"
67 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 68 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
68 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 69 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
69 #include "chrome/browser/speech/tts_controller.h" 70 #include "chrome/browser/speech/tts_controller.h"
70 #include "chrome/browser/speech/tts_message_filter.h" 71 #include "chrome/browser/speech/tts_message_filter.h"
71 #include "chrome/browser/ssl/ssl_add_certificate.h" 72 #include "chrome/browser/ssl/ssl_add_certificate.h"
72 #include "chrome/browser/ssl/ssl_blocking_page.h" 73 #include "chrome/browser/ssl/ssl_blocking_page.h"
73 #include "chrome/browser/ssl/ssl_cert_reporter.h" 74 #include "chrome/browser/ssl/ssl_cert_reporter.h"
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 } 1449 }
1449 1450
1450 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled)) 1451 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1451 command_line->AppendSwitch(switches::kDisablePrintPreview); 1452 command_line->AppendSwitch(switches::kDisablePrintPreview);
1452 1453
1453 InstantService* instant_service = 1454 InstantService* instant_service =
1454 InstantServiceFactory::GetForProfile(profile); 1455 InstantServiceFactory::GetForProfile(profile);
1455 if (instant_service && 1456 if (instant_service &&
1456 instant_service->IsInstantProcess(process->GetID())) 1457 instant_service->IsInstantProcess(process->GetID()))
1457 command_line->AppendSwitch(switches::kInstantProcess); 1458 command_line->AppendSwitch(switches::kInstantProcess);
1459
1460 if (ContextualSearchService::GetInstance()->IsContextualSearchProcess(
1461 process->GetID()))
1462 command_line->AppendSwitch(switches::kContextualSearchProcess);
1458 } 1463 }
1459 1464
1460 if (IsAutoReloadEnabled()) 1465 if (IsAutoReloadEnabled())
1461 command_line->AppendSwitch(switches::kEnableOfflineAutoReload); 1466 command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
1462 if (IsAutoReloadVisibleOnlyEnabled()) { 1467 if (IsAutoReloadVisibleOnlyEnabled()) {
1463 command_line->AppendSwitch( 1468 command_line->AppendSwitch(
1464 switches::kEnableOfflineAutoReloadVisibleOnly); 1469 switches::kEnableOfflineAutoReloadVisibleOnly);
1465 } 1470 }
1466 1471
1467 { 1472 {
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2710 if (channel <= kMaxDisableEncryptionChannel) { 2715 if (channel <= kMaxDisableEncryptionChannel) {
2711 static const char* const kWebRtcDevSwitchNames[] = { 2716 static const char* const kWebRtcDevSwitchNames[] = {
2712 switches::kDisableWebRtcEncryption, 2717 switches::kDisableWebRtcEncryption,
2713 }; 2718 };
2714 to_command_line->CopySwitchesFrom(from_command_line, 2719 to_command_line->CopySwitchesFrom(from_command_line,
2715 kWebRtcDevSwitchNames, 2720 kWebRtcDevSwitchNames,
2716 arraysize(kWebRtcDevSwitchNames)); 2721 arraysize(kWebRtcDevSwitchNames));
2717 } 2722 }
2718 } 2723 }
2719 #endif // defined(ENABLE_WEBRTC) 2724 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698