| Index: webkit/port/platform/chromium/FileChooserChromium.cpp
|
| ===================================================================
|
| --- webkit/port/platform/chromium/FileChooserChromium.cpp (revision 0)
|
| +++ webkit/port/platform/chromium/FileChooserChromium.cpp (working copy)
|
| @@ -27,12 +27,12 @@
|
| #include <shlwapi.h>
|
|
|
| #pragma warning(push, 0)
|
| -#include "ChromeClientWin.h"
|
| +#include "ChromeClientChromium.h"
|
| #include "Document.h"
|
| #include "Frame.h"
|
| #include "FileChooser.h"
|
| -#include "Icon.h"
|
| #include "LocalizedStrings.h"
|
| +#include "NotImplemented.h"
|
| #include "Page.h"
|
| #include "StringTruncator.h"
|
| #pragma warning(pop)
|
| @@ -45,8 +45,8 @@
|
| if (!frame)
|
| return;
|
|
|
| - ChromeClientWin* client =
|
| - static_cast<ChromeClientWin*>(frame->page()->chrome()->client());
|
| + ChromeClientChromium* client =
|
| + static_cast<ChromeClientChromium*>(frame->page()->chrome()->client());
|
|
|
| String result;
|
| client->runFileChooser(m_filename, &*this);
|
| @@ -61,10 +61,15 @@
|
| if (m_filename.isEmpty())
|
| string = fileButtonNoFileSelectedLabel();
|
| else {
|
| +#if PLATFORM(WIN_OS)
|
| String tmpFilename = m_filename;
|
| // Apple's code has a LPTSTR here, which will compile and run, but is wrong.
|
| wchar_t* basename = PathFindFileName(tmpFilename.charactersWithNullTermination());
|
| string = String(basename);
|
| +#else
|
| + notImplemented();
|
| + string = "fixme";
|
| +#endif
|
| }
|
|
|
| return StringTruncator::centerTruncate(string, static_cast<float>(width), font, false);
|
|
|
| Property changes on: webkit\port\platform\chromium\FileChooserChromium.cpp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/FileChooserWin.cpp:r69-2775
|
|
|
|
|
|
|