diff options
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_contents.h | 6 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.h | 2 |
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 |