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

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

Issue 6992019: Allow overriding WebUIFactory when test flag is set. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit from review. Created 9 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_web_ui_factory.h
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.h b/chrome/browser/ui/webui/chrome_web_ui_factory.h
index 0214baaa45db7936386db8039606ccc140f35dce..0457dde6153fa8e3b7d8c124023282bb0a1b9f9a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.h
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.h
@@ -35,16 +35,19 @@ class ChromeWebUIFactory : public content::WebUIFactory {
static ChromeWebUIFactory* GetInstance();
- private:
+ protected:
+ ChromeWebUIFactory();
virtual ~ChromeWebUIFactory();
+ private:
+
friend struct DefaultSingletonTraits<ChromeWebUIFactory>;
// Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI
// does not have a favicon.
RefCountedMemory* GetFaviconResourceBytes(const GURL& page_url) const;
- DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeWebUIFactory);
+ DISALLOW_COPY_AND_ASSIGN(ChromeWebUIFactory);
};
#endif // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_FACTORY_H_
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698