| Index: content/browser/webui/web_ui_data_source.h
|
| ===================================================================
|
| --- content/browser/webui/web_ui_data_source.h (revision 178359)
|
| +++ content/browser/webui/web_ui_data_source.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // 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_
|
| +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_DATA_SOURCE_H_
|
| +#define CONTENT_BROWSER_WEBUI_WEB_UI_DATA_SOURCE_H_
|
|
|
| #include <map>
|
| #include <string>
|
| @@ -12,17 +12,19 @@
|
| #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/browser/webui/url_data_manager.h"
|
| +#include "content/common/content_export.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 {
|
| +class CONTENT_EXPORT ChromeWebUIDataSource
|
| + : public NON_EXPORTED_BASE(URLDataSourceImpl),
|
| + public NON_EXPORTED_BASE(content::WebUIDataSource) {
|
| public:
|
| - static content::WebUIDataSource* Create(const std::string& source_name);
|
| + static content::WebUIDataSource* Create(
|
| + const std::string& source_name);
|
|
|
| // content::WebUIDataSource implementation:
|
| virtual void AddString(const std::string& name,
|
| @@ -61,7 +63,7 @@
|
| private:
|
| class InternalDataSource;
|
| friend class InternalDataSource;
|
| - friend class MockChromeWebUIDataSource;
|
| + friend class ChromeWebUIDataSourceTest;
|
|
|
| explicit ChromeWebUIDataSource(const std::string& source_name);
|
|
|
| @@ -94,4 +96,4 @@
|
| DISALLOW_COPY_AND_ASSIGN(ChromeWebUIDataSource);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
|
| +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_DATA_SOURCE_H_
|
|
|