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

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

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deps Created 8 years, 5 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/common/chrome_content_client.h ('k') | content/DEPS » ('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/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 return l10n_util::GetStringUTF16(message_id); 416 return l10n_util::GetStringUTF16(message_id);
417 } 417 }
418 418
419 base::StringPiece ChromeContentClient::GetDataResource( 419 base::StringPiece ChromeContentClient::GetDataResource(
420 int resource_id, 420 int resource_id,
421 ui::ScaleFactor scale_factor) const { 421 ui::ScaleFactor scale_factor) const {
422 return ResourceBundle::GetSharedInstance().GetRawDataResource( 422 return ResourceBundle::GetSharedInstance().GetRawDataResource(
423 resource_id, scale_factor); 423 resource_id, scale_factor);
424 } 424 }
425 425
426 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const {
427 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
428 }
429
426 #if defined(OS_WIN) 430 #if defined(OS_WIN)
427 bool ChromeContentClient::SandboxPlugin(CommandLine* command_line, 431 bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
428 sandbox::TargetPolicy* policy) { 432 sandbox::TargetPolicy* policy) {
429 std::wstring plugin_dll = command_line-> 433 std::wstring plugin_dll = command_line->
430 GetSwitchValueNative(switches::kPluginPath); 434 GetSwitchValueNative(switches::kPluginPath);
431 435
432 FilePath builtin_flash; 436 FilePath builtin_flash;
433 if (!PathService::Get(chrome::FILE_FLASH_PLUGIN, &builtin_flash)) 437 if (!PathService::Get(chrome::FILE_FLASH_PLUGIN, &builtin_flash))
434 return false; 438 return false;
435 439
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 506
503 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( 507 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
504 content::PepperPluginInfo* plugin, 508 content::PepperPluginInfo* plugin,
505 bool* override_npapi_flash) { 509 bool* override_npapi_flash) {
506 if (!ConductingPepperFlashFieldTrial()) 510 if (!ConductingPepperFlashFieldTrial())
507 return false; 511 return false;
508 return GetBundledPepperFlash(plugin, override_npapi_flash); 512 return GetBundledPepperFlash(plugin, override_npapi_flash);
509 } 513 }
510 514
511 } // namespace chrome 515 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698