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

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: Addressed Pedro's comments on naming methods in ContextualSearchApiController. Created 5 years, 1 month 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "chrome/browser/prerender/prerender_manager_factory.h" 55 #include "chrome/browser/prerender/prerender_manager_factory.h"
56 #include "chrome/browser/prerender/prerender_message_filter.h" 56 #include "chrome/browser/prerender/prerender_message_filter.h"
57 #include "chrome/browser/printing/printing_message_filter.h" 57 #include "chrome/browser/printing/printing_message_filter.h"
58 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 58 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
59 #include "chrome/browser/profiles/profile.h" 59 #include "chrome/browser/profiles/profile.h"
60 #include "chrome/browser/profiles/profile_io_data.h" 60 #include "chrome/browser/profiles/profile_io_data.h"
61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
62 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 62 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
63 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 63 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
64 #include "chrome/browser/safe_browsing/ui_manager.h" 64 #include "chrome/browser/safe_browsing/ui_manager.h"
65 #include "chrome/browser/search/contextual_search_api_controller.h"
65 #include "chrome/browser/search/instant_service.h" 66 #include "chrome/browser/search/instant_service.h"
66 #include "chrome/browser/search/instant_service_factory.h" 67 #include "chrome/browser/search/instant_service_factory.h"
67 #include "chrome/browser/search/search.h" 68 #include "chrome/browser/search/search.h"
68 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 69 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
69 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 70 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
70 #include "chrome/browser/speech/tts_controller.h" 71 #include "chrome/browser/speech/tts_controller.h"
71 #include "chrome/browser/speech/tts_message_filter.h" 72 #include "chrome/browser/speech/tts_message_filter.h"
72 #include "chrome/browser/ssl/ssl_add_certificate.h" 73 #include "chrome/browser/ssl/ssl_add_certificate.h"
73 #include "chrome/browser/ssl/ssl_blocking_page.h" 74 #include "chrome/browser/ssl/ssl_blocking_page.h"
74 #include "chrome/browser/ssl/ssl_cert_reporter.h" 75 #include "chrome/browser/ssl/ssl_cert_reporter.h"
(...skipping 1389 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 } 1465 }
1465 1466
1466 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled)) 1467 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1467 command_line->AppendSwitch(switches::kDisablePrintPreview); 1468 command_line->AppendSwitch(switches::kDisablePrintPreview);
1468 1469
1469 InstantService* instant_service = 1470 InstantService* instant_service =
1470 InstantServiceFactory::GetForProfile(profile); 1471 InstantServiceFactory::GetForProfile(profile);
1471 if (instant_service && 1472 if (instant_service &&
1472 instant_service->IsInstantProcess(process->GetID())) 1473 instant_service->IsInstantProcess(process->GetID()))
1473 command_line->AppendSwitch(switches::kInstantProcess); 1474 command_line->AppendSwitch(switches::kInstantProcess);
1475
1476 if (ContextualSearchApiController::GetInstance()
1477 ->IsContextualSearchProcessId(process->GetID()))
1478 command_line->AppendSwitch(switches::kContextualSearchProcess);
1474 } 1479 }
1475 1480
1476 if (IsAutoReloadEnabled()) 1481 if (IsAutoReloadEnabled())
1477 command_line->AppendSwitch(switches::kEnableOfflineAutoReload); 1482 command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
1478 if (IsAutoReloadVisibleOnlyEnabled()) { 1483 if (IsAutoReloadVisibleOnlyEnabled()) {
1479 command_line->AppendSwitch( 1484 command_line->AppendSwitch(
1480 switches::kEnableOfflineAutoReloadVisibleOnly); 1485 switches::kEnableOfflineAutoReloadVisibleOnly);
1481 } 1486 }
1482 1487
1483 { 1488 {
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 if (channel <= kMaxDisableEncryptionChannel) { 2730 if (channel <= kMaxDisableEncryptionChannel) {
2726 static const char* const kWebRtcDevSwitchNames[] = { 2731 static const char* const kWebRtcDevSwitchNames[] = {
2727 switches::kDisableWebRtcEncryption, 2732 switches::kDisableWebRtcEncryption,
2728 }; 2733 };
2729 to_command_line->CopySwitchesFrom(from_command_line, 2734 to_command_line->CopySwitchesFrom(from_command_line,
2730 kWebRtcDevSwitchNames, 2735 kWebRtcDevSwitchNames,
2731 arraysize(kWebRtcDevSwitchNames)); 2736 arraysize(kWebRtcDevSwitchNames));
2732 } 2737 }
2733 } 2738 }
2734 #endif // defined(ENABLE_WEBRTC) 2739 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698