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

Side by Side Diff: chrome/browser/chromeos/plugin_selection_policy.h

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/
Patch Set: Created 10 years, 2 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/browser/chromeos/plugin_selection_policy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_
6 #define CHROME_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_ 6 #define CHROME_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 typedef std::map<std::string, Policy> PolicyMap; 70 typedef std::map<std::string, Policy> PolicyMap;
71 71
72 PolicyMap policies_; 72 PolicyMap policies_;
73 bool initialized_; 73 bool initialized_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(PluginSelectionPolicy); 75 DISALLOW_COPY_AND_ASSIGN(PluginSelectionPolicy);
76 }; 76 };
77 77
78 } // namespace chromeos 78 } // namespace chromeos
79 #endif // CHROME_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_ 79 #endif // CHROME_BROWSER_CHROMEOS_PLUGIN_SELECTION_POLICY_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/plugin_selection_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698