Use one icon for all platforms.

BUG=91840
TEST=BUILD


Review URL: http://codereview.chromium.org/7810001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99828 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 8 insertions, 11 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 7064814..7f78f20 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -24,8 +24,7 @@
         'plugin_prefix': '',
         'name_suffix': '- Mac',
         'remoting_it2me_os_files': [
-          'resources/mac/chromoting128.png',
-          'resources/mac/chromoting16.png',
+          # Empty for now, may be used in future.
         ],
       }],
       ['os_posix == 1 and OS != "mac"', {
@@ -35,22 +34,19 @@
       ['OS=="linux" and chromeos==1', {
         'name_suffix': '- Chromebook',
         'remoting_it2me_os_files': [
-          'resources/chromeos/chromoting128.png',
-          'resources/chromeos/chromoting16.png',
+          # Empty for now, may be used in future.
         ],
       }],
       ['OS=="linux" and chromeos==0 and target_arch=="x64"', {
         'name_suffix': '- Linux - 64',
         'remoting_it2me_os_files': [
-          'resources/linux/chromoting128.png',
-          'resources/linux/chromoting16.png',
+          # Empty for now, may be used in future.
         ],
       }],
       ['OS=="linux" and chromeos==0 and target_arch!="x64"', {
         'name_suffix': '- Linux',
         'remoting_it2me_os_files': [
-          'resources/linux/chromoting128.png',
-          'resources/linux/chromoting16.png',
+          # Empty for now, may be used in future.
         ],
       }],
       ['OS=="win"', {
@@ -58,8 +54,7 @@
         'plugin_prefix': '',
         'name_suffix': '- Windows',
         'remoting_it2me_os_files': [
-          'resources/win/chromoting128.png',
-          'resources/win/chromoting16.png',
+          # Empty for now, may be used in future.
         ],
       }],
     ],
@@ -84,6 +79,8 @@
       'webapp/me2mom/spinner.gif',
       'webapp/me2mom/toolbar.css',
       'webapp/me2mom/xhr.js',
+      'resources/chromoting128.png',
+      'resources/chromoting16.png',
     ],
     'remoting_it2me_locale_files': [
       'webapp/me2mom/_locales/en/messages.json',
@@ -200,7 +197,7 @@
             'WRAPPER_EXTENSION': '<(plugin_extension)',
           },
           # TODO(mark): Come up with a fancier way to do this.  It should
-          # only be necessary to list framework-Info.plist once, not the
+          # only be necessary to list host_plugin-Info.plist once, not the
           # three times it is listed here.
           'mac_bundle_resources': [
             'host/disconnect_window.xib',
diff --git a/remoting/resources/chromeos/chromoting128.png b/remoting/resources/chromeos/chromoting128.png
deleted file mode 100644
index 919bcc2..0000000
--- a/remoting/resources/chromeos/chromoting128.png
+++ /dev/null
diff --git a/remoting/resources/chromeos/chromoting16.png b/remoting/resources/chromeos/chromoting16.png
deleted file mode 100644
index 6c06da7..0000000
--- a/remoting/resources/chromeos/chromoting16.png
+++ /dev/null
diff --git a/remoting/resources/linux/chromoting128.png b/remoting/resources/linux/chromoting128.png
deleted file mode 100644
index 0f6df4f..0000000
--- a/remoting/resources/linux/chromoting128.png
+++ /dev/null
diff --git a/remoting/resources/linux/chromoting16.png b/remoting/resources/linux/chromoting16.png
deleted file mode 100644
index 36e8e01..0000000
--- a/remoting/resources/linux/chromoting16.png
+++ /dev/null
diff --git a/remoting/resources/mac/chromoting128.png b/remoting/resources/mac/chromoting128.png
deleted file mode 100644
index ba693f7..0000000
--- a/remoting/resources/mac/chromoting128.png
+++ /dev/null
diff --git a/remoting/resources/mac/chromoting16.png b/remoting/resources/mac/chromoting16.png
deleted file mode 100644
index 2bc0384..0000000
--- a/remoting/resources/mac/chromoting16.png
+++ /dev/null
diff --git a/remoting/resources/win/chromoting128.png b/remoting/resources/win/chromoting128.png
deleted file mode 100644
index 8a534c7..0000000
--- a/remoting/resources/win/chromoting128.png
+++ /dev/null
diff --git a/remoting/resources/win/chromoting16.png b/remoting/resources/win/chromoting16.png
deleted file mode 100644
index 7d51210..0000000
--- a/remoting/resources/win/chromoting16.png
+++ /dev/null