mcHammer merge IconMac.cpp

webkit/port/platform/graphics/mac/IconMac.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 
 #include "Icon.h"
 #include "PassRefPtr.h"
 
 // TODO(port): These are temporary stubs, we need real implementations which
 // may come in the form of IconChromium.cpp.  The Windows Chromium
 // implementation is currently in IconWin.cpp.
  
 namespace WebCore {
 
-PassRefPtr<Icon> Icon::newIconForFile(const String& filename)
+PassRefPtr<Icon> Icon::createIconForFile(const String& filename)
+{
+    return NULL;
+}
+
+PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames)
 {
     return NULL;
 }
 
 Icon::~Icon()
 {
 }
 
 void Icon::paint(GraphicsContext* context, const IntRect& rect)
 {
 }
 
 }