diff options
| -rw-r--r-- | chrome/browser/browser_init.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 13 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 9 |
4 files changed, 16 insertions, 10 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 413432e..0075686 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -22,6 +22,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/session_startup_pref.h" #include "chrome/browser/tab_contents/navigation_controller.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -38,7 +39,6 @@ #include "grit/theme_resources.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_list.h" -#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index c7a7a13..5f1caa1 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -77,6 +77,7 @@ /* Begin PBXBuildFile section */ 0EE123B79B750A2FCEFB4569 /* history_backend_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F00E9D48F7009A6919 /* history_backend_unittest.cc */; }; 1C284EB767D0E3D302AC675C /* tab_restore_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = B020A11D500D7519E54F2957 /* tab_restore_service.cc */; }; + 2760C4346D6AB3AD94E9CF05 /* url_fixer_upper.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16EF40F2145C600861FAC /* url_fixer_upper.cc */; }; 2DF2A9EB8AF96926EE9B6B02 /* ipc_logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBAE0E9D4C9F009A6919 /* ipc_logging.cc */; }; 331218220F3BFF32006CB2B0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 331B93A90F3BF2B9008B1C46 /* QuartzCore.framework */; }; 331218230F3BFF36006CB2B0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 331B93AB0F3BF2DA008B1C46 /* Carbon.framework */; }; @@ -5402,6 +5403,7 @@ E4F324600EE5D011002533CE /* url_database.cc in Sources */, 8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */, 3AEA44DB19C9D93B63D7A2E4 /* url_fetcher_protect.cc in Sources */, + 2760C4346D6AB3AD94E9CF05 /* url_fixer_upper.cc in Sources */, E48FB9760EC4EA320052B72B /* url_request_failed_dns_job.cc in Sources */, E48FB9790EC4EA410052B72B /* url_request_mock_http_job.cc in Sources */, E48FB97A0EC4EA4A0052B72B /* url_request_mock_net_error_job.cc in Sources */, diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index cd72777..e64785d 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -31,6 +31,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_plugin_util.h" #include "chrome/common/gfx/chrome_font.h" +#include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_service.h" #include "chrome/common/process_watcher.h" @@ -490,3 +491,15 @@ std::vector<BookmarkNode*> GetMostRecentlyModifiedGroups(BookmarkModel* model, ScopableCPRequest::~ScopableCPRequest() { NOTIMPLEMENTED(); } + +#if defined(OS_MACOSX) +namespace gfx { +std::wstring GetCleanStringFromUrl(const GURL& url, + const std::wstring& languages, + url_parse::Parsed* new_parsed, + size_t* prefix_end) { + NOTIMPLEMENTED(); + return L""; +} +} +#endif diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 6a7d17e..def13b1 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -861,15 +861,6 @@ class WebAppLauncher { } }; -class URLFixerUpper { - public: - static std::wstring FixupRelativeFile(const std::wstring& base_dir, - const std::wstring& text) { - NOTIMPLEMENTED(); - return L"about:blank"; - } -}; - //--------------------------------------------------------------------------- // These stubs are for WebContents |