summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-15 21:17:36 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-15 21:17:36 +0000
commitf0f349cff11966bfc68444b148dfaeec45425878 (patch)
treebb8a83363c5a805f6fce0edacef4dd6b5cada415 /webkit/port
parent80bd88bc057321950eb9db5dfdbe128af76fdbcc (diff)
downloadchromium_src-f0f349cff11966bfc68444b148dfaeec45425878.zip
chromium_src-f0f349cff11966bfc68444b148dfaeec45425878.tar.gz
chromium_src-f0f349cff11966bfc68444b148dfaeec45425878.tar.bz2
Fun file renaming patch.
SoundPosix.cpp -> SoundChromiumPosix.cpp IconMac.cpp -> IconChromiumMac.cpp IconLinux.cpp -> IconChromiumLinux.cpp R=evan Review URL: http://codereview.chromium.org/14433 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/platform/chromium/SoundChromiumPosix.cpp41
-rw-r--r--webkit/port/platform/chromium/SoundPosix.cpp15
-rw-r--r--webkit/port/platform/graphics/chromium/IconChromiumLinux.cpp (renamed from webkit/port/platform/chromium/IconLinux.cpp)0
-rw-r--r--webkit/port/platform/graphics/chromium/IconChromiumMac.cpp (renamed from webkit/port/platform/graphics/mac/IconMac.cpp)0
4 files changed, 41 insertions, 15 deletions
diff --git a/webkit/port/platform/chromium/SoundChromiumPosix.cpp b/webkit/port/platform/chromium/SoundChromiumPosix.cpp
new file mode 100644
index 0000000..4e3790a
--- /dev/null
+++ b/webkit/port/platform/chromium/SoundChromiumPosix.cpp
@@ -0,0 +1,41 @@
+// 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
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "config.h"
+#include "Sound.h"
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void systemBeep()
+{
+ notImplemented();
+}
+
+}
diff --git a/webkit/port/platform/chromium/SoundPosix.cpp b/webkit/port/platform/chromium/SoundPosix.cpp
deleted file mode 100644
index 61964a1..0000000
--- a/webkit/port/platform/chromium/SoundPosix.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-#include "Sound.h"
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-void systemBeep() {
- notImplemented();
-}
-
-}
diff --git a/webkit/port/platform/chromium/IconLinux.cpp b/webkit/port/platform/graphics/chromium/IconChromiumLinux.cpp
index 9c38d84..9c38d84 100644
--- a/webkit/port/platform/chromium/IconLinux.cpp
+++ b/webkit/port/platform/graphics/chromium/IconChromiumLinux.cpp
diff --git a/webkit/port/platform/graphics/mac/IconMac.cpp b/webkit/port/platform/graphics/chromium/IconChromiumMac.cpp
index 6514d71..6514d71 100644
--- a/webkit/port/platform/graphics/mac/IconMac.cpp
+++ b/webkit/port/platform/graphics/chromium/IconChromiumMac.cpp