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

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

Issue 10383006: Add scale factor and 2x resources from webkit and plumb through to ContentClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add more test class GetImageResource methods. Created 8 years, 7 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 | « no previous file | 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 16 matching lines...) Expand all
27 virtual void AddNPAPIPlugins( 27 virtual void AddNPAPIPlugins(
28 webkit::npapi::PluginList* plugin_list) OVERRIDE; 28 webkit::npapi::PluginList* plugin_list) OVERRIDE;
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(int resource_id) const OVERRIDE; 36 virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE;
37 virtual base::StringPiece GetImageResource(int resource_id,
38 float scale_factor) const OVERRIDE;
37 39
38 #if defined(OS_WIN) 40 #if defined(OS_WIN)
39 virtual bool SandboxPlugin(CommandLine* command_line, 41 virtual bool SandboxPlugin(CommandLine* command_line,
40 sandbox::TargetPolicy* policy) OVERRIDE; 42 sandbox::TargetPolicy* policy) OVERRIDE;
41 #endif 43 #endif
42 44
43 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
44 virtual bool GetSandboxProfileForSandboxType( 46 virtual bool GetSandboxProfileForSandboxType(
45 int sandbox_type, 47 int sandbox_type,
46 int* sandbox_profile_resource_id) const OVERRIDE; 48 int* sandbox_profile_resource_id) const OVERRIDE;
47 #endif 49 #endif
48 50
49 // Gets information about the bundled Pepper Flash for field trial. 51 // Gets information about the bundled Pepper Flash for field trial.
50 // |override_npapi_flash| indicates whether it should take precedence over 52 // |override_npapi_flash| indicates whether it should take precedence over
51 // the internal NPAPI Flash. 53 // the internal NPAPI Flash.
52 // Returns false if bundled Pepper Flash is not available. In that case, 54 // Returns false if bundled Pepper Flash is not available. In that case,
53 // |plugin| and |override_npapi_flash| are not touched. 55 // |plugin| and |override_npapi_flash| are not touched.
54 // 56 //
55 // TODO(yzshen): We need this method because currently we are having a field 57 // TODO(yzshen): We need this method because currently we are having a field
56 // trial with bundled Pepper Flash, and need extra information about how to 58 // trial with bundled Pepper Flash, and need extra information about how to
57 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial 59 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial
58 // is over, we should merge this into AddPepperPlugins(). 60 // is over, we should merge this into AddPepperPlugins().
59 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin, 61 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin,
60 bool* override_npapi_flash); 62 bool* override_npapi_flash);
61 }; 63 };
62 64
63 } // namespace chrome 65 } // namespace chrome
64 66
65 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 67 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698