diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 16:46:44 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 16:46:44 +0000 |
| commit | 748f1130a5fc046b5042390dd08b27df4b64c0cc (patch) | |
| tree | 3ad8a04c0ae95e6dd1b32fba5cc4dff5dada30a8 /webkit/pending | |
| parent | 877334cf05fb04080e3c7a35a35ab14211601228 (diff) | |
| download | chromium_src-748f1130a5fc046b5042390dd08b27df4b64c0cc.zip chromium_src-748f1130a5fc046b5042390dd08b27df4b64c0cc.tar.gz chromium_src-748f1130a5fc046b5042390dd08b27df4b64c0cc.tar.bz2 | |
Wrap last change in USE_GOOGLE_URL_LIBRARY
Review URL: http://codereview.chromium.org/6241
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
| -rw-r--r-- | webkit/pending/KURL.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/pending/KURL.h b/webkit/pending/KURL.h index eabbb5a..b270a15 100644 --- a/webkit/pending/KURL.h +++ b/webkit/pending/KURL.h @@ -209,7 +209,11 @@ public: operator NSURL*() const; #endif #ifdef __OBJC__ +#ifdef USE_GOOGLE_URL_LIBRARY operator NSString*() const { return string(); } +#else // USE_GOOGLE_URL_LIBRARY + operator NSString*() const { return m_string; } +#endif // USE_GOOGLE_URL_LIBRARY #endif #if PLATFORM(QT) |