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

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

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/chrome_dll.gypi ('k') | chrome/common/chrome_content_client.cc » ('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 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 virtual void AddAdditionalSchemes( 29 virtual void AddAdditionalSchemes(
30 std::vector<std::string>* standard_schemes, 30 std::vector<std::string>* standard_schemes,
31 std::vector<std::string>* saveable_shemes) OVERRIDE; 31 std::vector<std::string>* saveable_shemes) OVERRIDE;
32 virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE; 32 virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE;
33 virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE; 33 virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
34 virtual std::string GetUserAgent() const OVERRIDE; 34 virtual std::string GetUserAgent() const OVERRIDE;
35 virtual string16 GetLocalizedString(int message_id) const OVERRIDE; 35 virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
36 virtual base::StringPiece GetDataResource( 36 virtual base::StringPiece GetDataResource(
37 int resource_id, 37 int resource_id,
38 ui::ScaleFactor scale_factor) const OVERRIDE; 38 ui::ScaleFactor scale_factor) const OVERRIDE;
39 virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
39 40
40 #if defined(OS_WIN) 41 #if defined(OS_WIN)
41 virtual bool SandboxPlugin(CommandLine* command_line, 42 virtual bool SandboxPlugin(CommandLine* command_line,
42 sandbox::TargetPolicy* policy) OVERRIDE; 43 sandbox::TargetPolicy* policy) OVERRIDE;
43 #endif 44 #endif
44 45
45 #if defined(OS_MACOSX) 46 #if defined(OS_MACOSX)
46 virtual bool GetSandboxProfileForSandboxType( 47 virtual bool GetSandboxProfileForSandboxType(
47 int sandbox_type, 48 int sandbox_type,
48 int* sandbox_profile_resource_id) const OVERRIDE; 49 int* sandbox_profile_resource_id) const OVERRIDE;
49 #endif 50 #endif
50 51
51 // Gets information about the bundled Pepper Flash for field trial. 52 // Gets information about the bundled Pepper Flash for field trial.
52 // |override_npapi_flash| indicates whether it should take precedence over 53 // |override_npapi_flash| indicates whether it should take precedence over
53 // the internal NPAPI Flash. 54 // the internal NPAPI Flash.
54 // Returns false if bundled Pepper Flash is not available. In that case, 55 // Returns false if bundled Pepper Flash is not available. In that case,
55 // |plugin| and |override_npapi_flash| are not touched. 56 // |plugin| and |override_npapi_flash| are not touched.
56 // 57 //
57 // TODO(yzshen): We need this method because currently we are having a field 58 // TODO(yzshen): We need this method because currently we are having a field
58 // trial with bundled Pepper Flash, and need extra information about how to 59 // trial with bundled Pepper Flash, and need extra information about how to
59 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial 60 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial
60 // is over, we should merge this into AddPepperPlugins(). 61 // is over, we should merge this into AddPepperPlugins().
61 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin, 62 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin,
62 bool* override_npapi_flash); 63 bool* override_npapi_flash);
63 }; 64 };
64 65
65 } // namespace chrome 66 } // namespace chrome
66 67
67 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 68 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698