Merge Chromium src@r53293

Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34

1 files changed, 21 insertions, 0 deletions

diff --git a/chrome/browser/gtk/status_icons/status_tray_gtk.cc b/chrome/browser/gtk/status_icons/status_tray_gtk.cc
new file mode 100644
index 0000000..6b2764e
--- /dev/null
+++ b/chrome/browser/gtk/status_icons/status_tray_gtk.cc
@@ -0,0 +1,21 @@
+// Copyright (c) 2010 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 "chrome/browser/gtk/status_icons/status_tray_gtk.h"
+
+#include "chrome/browser/gtk/status_icons/status_icon_gtk.h"
+
+StatusTrayGtk::StatusTrayGtk() {
+}
+
+StatusTrayGtk::~StatusTrayGtk() {
+}
+
+StatusIcon* StatusTrayGtk::CreateStatusIcon() {
+  return new StatusIconGtk();
+}
+
+StatusTray* StatusTray::Create() {
+  return new StatusTrayGtk();
+}