diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-15 00:31:13 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-15 00:31:13 +0000 |
| commit | 8b0cd590f7f3fe8d3404899f08c609da921edc1d (patch) | |
| tree | 915136ea466a3128710c36680dae9e443ee94128 | |
| parent | 65d0aa005c5478ef203e5d0138f413b655640437 (diff) | |
| download | chromium_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
| -rw-r--r-- | chrome/browser/browser.scons | 1 | ||||
| -rw-r--r-- | chrome/browser/browser_url_handler.h | 9 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_contents.h | 6 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.h | 2 | ||||
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 8f5b1ab..45106bd 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -677,7 +677,6 @@ if not env.Bit('windows'): 'browser_accessibility.cc', 'browser_accessibility_manager.cc', 'browser_shutdown.cc', - 'browser_url_handler.cc', 'chrome_plugin_host.cc', 'dock_info.cc', 'dom_ui/dom_ui_contents.cc', diff --git a/chrome/browser/browser_url_handler.h b/chrome/browser/browser_url_handler.h index d5bf7f4..da0bbd4 100644 --- a/chrome/browser/browser_url_handler.h +++ b/chrome/browser/browser_url_handler.h @@ -9,13 +9,14 @@ // random web pages (because from the resource loader's perspective, these // URL schemes don't exist). -#ifndef CHROME_BROWSER_BROWSER_URL_HANDLER_H__ -#define CHROME_BROWSER_BROWSER_URL_HANDLER_H__ +#ifndef CHROME_BROWSER_BROWSER_URL_HANDLER_H_ +#define CHROME_BROWSER_BROWSER_URL_HANDLER_H_ #include <vector> +#include "chrome/browser/tab_contents/tab_contents_type.h" + class GURL; -enum TabContentsType; // BrowserURLHandler manages the list of all special URLs and manages // dispatching the URL handling to registered handlers. @@ -44,5 +45,5 @@ class BrowserURLHandler { static std::vector<URLHandler> url_handlers_; }; -#endif // CHROME_BROWSER_BROWSER_URL_HANDLER_H__ +#endif // CHROME_BROWSER_BROWSER_URL_HANDLER_H_ 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 diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index 49271e6..bd11ab2 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -245,6 +245,7 @@ 671555F7DF06E224B646E5D2 /* backing_store_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = B94B5B0CBF4D7FAC48BB1AE2 /* backing_store_posix.cc */; }; 6A3646C882BD4CC722624544 /* character_encoding.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8590E9D4839009A6919 /* character_encoding.cc */; }; 6D62D71064BA3204EF0A964A /* autofill_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 629BF493DEA096E2DD844F2B /* autofill_manager.cc */; }; + 6F0216553E10E43760954EFB /* browser_url_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF84A0E9D4839009A6919 /* browser_url_handler.cc */; }; 70F87705D5BDD8E76A712336 /* ssl_host_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = F60D7722C1302E1EC789B67A /* ssl_host_state.cc */; }; 71784BA931A610A94A7FEDC9 /* history_querying_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F50E9D48F7009A6919 /* history_querying_unittest.cc */; }; 7442556F908264C52BEBFE4D /* starred_url_database_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA090E9D48F7009A6919 /* starred_url_database_unittest.cc */; }; @@ -5335,6 +5336,7 @@ B61C4EDC0F34EE8300489E0F /* browser_process_impl.cc in Sources */, A76E43A40F29039C009A7E88 /* browser_render_process_host.cc in Sources */, E45075B80F15060C003BE099 /* browser_trial.cc in Sources */, + 6F0216553E10E43760954EFB /* browser_url_handler.cc in Sources */, E48B68640F2637B6002E47EC /* browser_window_cocoa.mm in Sources */, E48B68570F26330C002E47EC /* browser_window_controller.mm in Sources */, E48B684D0F2630D3002E47EC /* browser_window_factory.mm in Sources */, |