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

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_data_source.h

Issue 12049052: Move core url data manager classes to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chrome_web_ui_data_source.h
===================================================================
--- chrome/browser/ui/webui/chrome_web_ui_data_source.h (revision 178598)
+++ chrome/browser/ui/webui/chrome_web_ui_data_source.h (working copy)
@@ -2,96 +2,5 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
-
-#include <map>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/callback.h"
-#include "base/compiler_specific.h"
-#include "base/values.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "content/public/browser/url_data_source.h"
-#include "content/public/browser/web_ui_data_source.h"
-
-// A data source that can help with implementing the common operations
-// needed by the chrome WEBUI settings/history/downloads pages.
-// DO NOT DERIVE FROM THIS CLASS! http://crbug.com/169170
-class ChromeWebUIDataSource : public URLDataSourceImpl,
- public content::WebUIDataSource {
- public:
- static content::WebUIDataSource* Create(const std::string& source_name);
-
- // content::WebUIDataSource implementation:
- virtual void AddString(const std::string& name,
- const string16& value) OVERRIDE;
- virtual void AddString(const std::string& name,
- const std::string& value) OVERRIDE;
- virtual void AddLocalizedString(const std::string& name, int ids) OVERRIDE;
- virtual void AddLocalizedStrings(
- const DictionaryValue& localized_strings) OVERRIDE;
- virtual void AddBoolean(const std::string& name, bool value) OVERRIDE;
- virtual void SetJsonPath(const std::string& path) OVERRIDE;
- virtual void SetUseJsonJSFormatV2() OVERRIDE;
- virtual void AddResourcePath(const std::string &path,
- int resource_id) OVERRIDE;
- virtual void SetDefaultResource(int resource_id) OVERRIDE;
- virtual void SetRequestFilter(
- const content::WebUIDataSource::HandleRequestCallback& callback) OVERRIDE;
- virtual void DisableContentSecurityPolicy() OVERRIDE;
- virtual void OverrideContentSecurityPolicyObjectSrc(
- const std::string& data) OVERRIDE;
- virtual void OverrideContentSecurityPolicyFrameSrc(
- const std::string& data) OVERRIDE;
- virtual void DisableDenyXFrameOptions() OVERRIDE;
-
- protected:
- virtual ~ChromeWebUIDataSource();
-
- // Completes a request by sending our dictionary of localized strings.
- void SendLocalizedStringsAsJSON(
- const content::URLDataSource::GotDataCallback& callback);
-
- // Completes a request by sending the file specified by |idr|.
- void SendFromResourceBundle(
- const content::URLDataSource::GotDataCallback& callback, int idr);
-
- private:
- class InternalDataSource;
- friend class InternalDataSource;
- friend class MockChromeWebUIDataSource;
-
- explicit ChromeWebUIDataSource(const std::string& source_name);
-
- // Methods that match content::URLDataSource which are called by
- // InternalDataSource.
- std::string GetSource();
- std::string GetMimeType(const std::string& path) const;
- void StartDataRequest(
- const std::string& path,
- bool is_incognito,
- const content::URLDataSource::GotDataCallback& callback);
-
- // The name of this source.
- // E.g., for favicons, this could be "favicon", which results in paths for
- // specific resources like "favicon/34" getting sent to this source.
- std::string source_name_;
- int default_resource_;
- bool json_js_format_v2_;
- std::string json_path_;
- std::map<std::string, int> path_to_idr_map_;
- DictionaryValue localized_strings_;
- content::WebUIDataSource::HandleRequestCallback filter_callback_;
- bool add_csp_;
- bool object_src_set_;
- std::string object_src_;
- bool frame_src_set_;
- std::string frame_src_;
- bool deny_xframe_options_;
-
- DISALLOW_COPY_AND_ASSIGN(ChromeWebUIDataSource);
-};
-
-#endif // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
+// temporary forwarding header
+#include "content/browser/webui/web_ui_data_source.h"
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_factory.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698