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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 11896113: Add chrome-search: access from Instant overlay (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yet another rebase 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } 375 }
376 376
377 void ChromeContentClient::AddAdditionalSchemes( 377 void ChromeContentClient::AddAdditionalSchemes(
378 std::vector<std::string>* standard_schemes, 378 std::vector<std::string>* standard_schemes,
379 std::vector<std::string>* savable_schemes) { 379 std::vector<std::string>* savable_schemes) {
380 standard_schemes->push_back(extensions::kExtensionScheme); 380 standard_schemes->push_back(extensions::kExtensionScheme);
381 savable_schemes->push_back(extensions::kExtensionScheme); 381 savable_schemes->push_back(extensions::kExtensionScheme);
382 standard_schemes->push_back(kExtensionResourceScheme); 382 standard_schemes->push_back(kExtensionResourceScheme);
383 savable_schemes->push_back(kExtensionResourceScheme); 383 savable_schemes->push_back(kExtensionResourceScheme);
384 standard_schemes->push_back(chrome::kChromeSearchScheme); 384 standard_schemes->push_back(chrome::kChromeSearchScheme);
385 savable_schemes->push_back(chrome::kChromeSearchScheme);
385 #if defined(OS_CHROMEOS) 386 #if defined(OS_CHROMEOS)
386 standard_schemes->push_back(kCrosScheme); 387 standard_schemes->push_back(kCrosScheme);
387 #endif 388 #endif
388 } 389 }
389 390
390 bool ChromeContentClient::CanHandleWhileSwappedOut( 391 bool ChromeContentClient::CanHandleWhileSwappedOut(
391 const IPC::Message& msg) { 392 const IPC::Message& msg) {
392 // Any Chrome-specific messages (apart from those listed in 393 // Any Chrome-specific messages (apart from those listed in
393 // CanSendWhileSwappedOut) that must be handled by the browser when sent from 394 // CanSendWhileSwappedOut) that must be handled by the browser when sent from
394 // swapped out renderers. 395 // swapped out renderers.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 450 }
450 return false; 451 return false;
451 } 452 }
452 453
453 std::string ChromeContentClient::GetCarbonInterposePath() const { 454 std::string ChromeContentClient::GetCarbonInterposePath() const {
454 return std::string(kInterposeLibraryPath); 455 return std::string(kInterposeLibraryPath);
455 } 456 }
456 #endif 457 #endif
457 458
458 } // namespace chrome 459 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698