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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.h

Issue 10407105: Improve error messaging of webRequest API in case of conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT Created 8 years, 3 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
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_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 virtual ~ExtensionSettingsHandler(); 65 virtual ~ExtensionSettingsHandler();
66 66
67 static void RegisterUserPrefs(PrefService* prefs); 67 static void RegisterUserPrefs(PrefService* prefs);
68 68
69 // Extension Detail JSON Struct for page. |pages| is injected for unit 69 // Extension Detail JSON Struct for page. |pages| is injected for unit
70 // testing. 70 // testing.
71 // Note: |warning_set| can be NULL in unit tests. 71 // Note: |warning_set| can be NULL in unit tests.
72 base::DictionaryValue* CreateExtensionDetailValue( 72 base::DictionaryValue* CreateExtensionDetailValue(
73 const extensions::Extension* extension, 73 const extensions::Extension* extension,
74 const std::vector<ExtensionPage>& pages, 74 const std::vector<ExtensionPage>& pages,
75 const ExtensionWarningSet* warning_set); 75 const ExtensionWarningService* warning_set);
76 76
77 void GetLocalizedValues(base::DictionaryValue* localized_strings); 77 void GetLocalizedValues(base::DictionaryValue* localized_strings);
78 78
79 // content::WebContentsObserver implementation, which reloads all unpacked 79 // content::WebContentsObserver implementation, which reloads all unpacked
80 // extensions whenever chrome://extensions is reloaded. 80 // extensions whenever chrome://extensions is reloaded.
81 virtual void NavigateToPendingEntry( 81 virtual void NavigateToPendingEntry(
82 const GURL& url, 82 const GURL& url,
83 content::NavigationController::ReloadType reload_type) OVERRIDE; 83 content::NavigationController::ReloadType reload_type) OVERRIDE;
84 84
85 private: 85 private:
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 content::NotificationRegistrar registrar_; 215 content::NotificationRegistrar registrar_;
216 216
217 PrefChangeRegistrar pref_registrar_; 217 PrefChangeRegistrar pref_registrar_;
218 PrefChangeRegistrar local_state_pref_registrar_; 218 PrefChangeRegistrar local_state_pref_registrar_;
219 219
220 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler); 220 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
221 }; 221 };
222 222
223 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ 223 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698