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

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

Issue 10871013: Add !defined(OS_IOS) to if defined(OS_MACOS) around functions GetSandboxProfileForSandboxType and G… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
« 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 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 24 matching lines...) Expand all
35 virtual base::StringPiece GetDataResource( 35 virtual base::StringPiece GetDataResource(
36 int resource_id, 36 int resource_id,
37 ui::ScaleFactor scale_factor) const OVERRIDE; 37 ui::ScaleFactor scale_factor) const OVERRIDE;
38 virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE; 38 virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 virtual bool SandboxPlugin(CommandLine* command_line, 41 virtual bool SandboxPlugin(CommandLine* command_line,
42 sandbox::TargetPolicy* policy) OVERRIDE; 42 sandbox::TargetPolicy* policy) OVERRIDE;
43 #endif 43 #endif
44 44
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX) && !defined(OS_IOS)
46 virtual bool GetSandboxProfileForSandboxType( 46 virtual bool GetSandboxProfileForSandboxType(
47 int sandbox_type, 47 int sandbox_type,
48 int* sandbox_profile_resource_id) const OVERRIDE; 48 int* sandbox_profile_resource_id) const OVERRIDE;
49 virtual std::string GetCarbonInterposePath() const OVERRIDE; 49 virtual std::string GetCarbonInterposePath() const OVERRIDE;
50 #endif 50 #endif
51 51
52 // Gets information about the bundled Pepper Flash for field trial. 52 // Gets information about the bundled Pepper Flash for field trial.
53 // |override_npapi_flash| indicates whether it should take precedence over 53 // |override_npapi_flash| indicates whether it should take precedence over
54 // the internal NPAPI Flash. 54 // the internal NPAPI Flash.
55 // 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,
56 // |plugin| and |override_npapi_flash| are not touched. 56 // |plugin| and |override_npapi_flash| are not touched.
57 // 57 //
58 // 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
59 // 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
60 // 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
61 // is over, we should merge this into AddPepperPlugins(). 61 // is over, we should merge this into AddPepperPlugins().
62 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin, 62 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin,
63 bool* override_npapi_flash); 63 bool* override_npapi_flash);
64 }; 64 };
65 65
66 } // namespace chrome 66 } // namespace chrome
67 67
68 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 68 #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