summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-15 00:31:13 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-15 00:31:13 +0000
commit8b0cd590f7f3fe8d3404899f08c609da921edc1d (patch)
tree915136ea466a3128710c36680dae9e443ee94128 /chrome/browser/dom_ui
parent65d0aa005c5478ef203e5d0138f413b655640437 (diff)
downloadchromium_src-8b0cd590f7f3fe8d3404899f08c609da921edc1d.zip
chromium_src-8b0cd590f7f3fe8d3404899f08c609da921edc1d.tar.gz
chromium_src-8b0cd590f7f3fe8d3404899f08c609da921edc1d.tar.bz2
Make browser_url_handler.cc compile on Posix.
Review URL: http://codereview.chromium.org/21380 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/dom_ui_contents.h6
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_contents.h b/chrome/browser/dom_ui/dom_ui_contents.h
index 8042189..58daf01 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.h
+++ b/chrome/browser/dom_ui/dom_ui_contents.h
@@ -4,8 +4,8 @@
// Contains code for managing local HTML UI at chrome-ui:// URLs.
-#ifndef CHROME_BROWSER_DOM_UI_CONTENTS_H__
-#define CHROME_BROWSER_DOM_UI_CONTENTS_H__
+#ifndef CHROME_BROWSER_DOM_UI_CONTENTS_H_
+#define CHROME_BROWSER_DOM_UI_CONTENTS_H_
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/tab_contents/web_contents.h"
@@ -120,4 +120,4 @@ class DOMUIContents : public WebContents {
DISALLOW_COPY_AND_ASSIGN(DOMUIContents);
};
-#endif // CHROME_BROWSER_DOM_UI_CONTENTS_H__ \ No newline at end of file
+#endif // CHROME_BROWSER_DOM_UI_CONTENTS_H_
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index 0a2da66..a44060e 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -97,7 +97,7 @@ class MostVisitedHandler : public DOMMessageHandler,
DOMUIHost* dom_ui_host_;
// Our consumer for the history service.
- CancelableRequestConsumerT<PageUsageData*, NULL> cancelable_consumer_;
+ CancelableRequestConsumerTSimple<PageUsageData*> cancelable_consumer_;
// The most visited URLs, in priority order.
// Only used for matching up clicks on the page to which most visited entry