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/browser/extensions/api/declarative_content/content_action.h

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 const base::Value& json_action, 115 const base::Value& json_action,
116 std::string* error, 116 std::string* error,
117 bool* bad_message); 117 bool* bad_message);
118 118
119 static bool InitScriptData(const base::DictionaryValue* dict, 119 static bool InitScriptData(const base::DictionaryValue* dict,
120 std::string* error, 120 std::string* error,
121 bool* bad_message, 121 bool* bad_message,
122 ScriptData* script_data); 122 ScriptData* script_data);
123 123
124 // Implementation of ContentAction: 124 // Implementation of ContentAction:
125 virtual Type GetType() const OVERRIDE; 125 virtual Type GetType() const override;
126 126
127 virtual void Apply(const std::string& extension_id, 127 virtual void Apply(const std::string& extension_id,
128 const base::Time& extension_install_time, 128 const base::Time& extension_install_time,
129 ApplyInfo* apply_info) const OVERRIDE; 129 ApplyInfo* apply_info) const override;
130 130
131 virtual void Reapply(const std::string& extension_id, 131 virtual void Reapply(const std::string& extension_id,
132 const base::Time& extension_install_time, 132 const base::Time& extension_install_time,
133 ApplyInfo* apply_info) const OVERRIDE; 133 ApplyInfo* apply_info) const override;
134 134
135 virtual void Revert(const std::string& extension_id, 135 virtual void Revert(const std::string& extension_id,
136 const base::Time& extension_install_time, 136 const base::Time& extension_install_time,
137 ApplyInfo* apply_info) const OVERRIDE; 137 ApplyInfo* apply_info) const override;
138 138
139 private: 139 private:
140 void InitScript(const Extension* extension, const ScriptData& script_data); 140 void InitScript(const Extension* extension, const ScriptData& script_data);
141 141
142 void AddScript() { 142 void AddScript() {
143 DCHECK(master_); 143 DCHECK(master_);
144 master_->AddScript(script_); 144 master_->AddScript(script_);
145 } 145 }
146 146
147 virtual ~RequestContentScript(); 147 virtual ~RequestContentScript();
148 148
149 void InstructRenderProcessToInject(content::WebContents* contents, 149 void InstructRenderProcessToInject(content::WebContents* contents,
150 const std::string& extension_id) const; 150 const std::string& extension_id) const;
151 151
152 UserScript script_; 152 UserScript script_;
153 DeclarativeUserScriptMaster* master_; 153 DeclarativeUserScriptMaster* master_;
154 154
155 DISALLOW_COPY_AND_ASSIGN(RequestContentScript); 155 DISALLOW_COPY_AND_ASSIGN(RequestContentScript);
156 }; 156 };
157 157
158 typedef DeclarativeActionSet<ContentAction> ContentActionSet; 158 typedef DeclarativeActionSet<ContentAction> ContentActionSet;
159 159
160 } // namespace extensions 160 } // namespace extensions
161 161
162 #endif // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_ 162 #endif // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698