summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 18:12:44 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 18:12:44 +0000
commit5c59a227d0f9265b312c306ac0dc2b4669fda96b (patch)
tree51a8d5ac8a636c95fee4a2efb32a5eb8a568fa0f /chrome/chrome_browser.gypi
parentd9b440dcd0f7a9b89ac687e2600cfd8d9f123ee9 (diff)
downloadchromium_src-5c59a227d0f9265b312c306ac0dc2b4669fda96b.zip
chromium_src-5c59a227d0f9265b312c306ac0dc2b4669fda96b.tar.gz
chromium_src-5c59a227d0f9265b312c306ac0dc2b4669fda96b.tar.bz2
Revert 140554 - Rename and move balloon_collection_impl_aura, rename balloon_view.cc
Also llow BalloonView.GetHost() to return NULL BUG=124914 TEST=All notification related tests pass, notitifications work on all platforms (no behavior changes). TBR=ben (ooo for the week) Review URL: https://chromiumcodereview.appspot.com/10502026 TBR=stevenjb@google.com Review URL: https://chromiumcodereview.appspot.com/10541010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 55bd901..5c8c6ff 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -760,6 +760,8 @@
'browser/chromeos/network_login_observer.h',
'browser/chromeos/network_message_observer.cc',
'browser/chromeos/network_message_observer.h',
+ 'browser/chromeos/notifications/balloon_collection_impl_aura.cc',
+ 'browser/chromeos/notifications/balloon_collection_impl_aura.h',
'browser/chromeos/notifications/balloon_view_host_chromeos.cc',
'browser/chromeos/notifications/balloon_view_host_chromeos.h',
'browser/chromeos/notifications/system_notification.cc',
@@ -3330,8 +3332,6 @@
'browser/ui/views/ash/app_list/extension_app_item.h',
'browser/ui/views/ash/app_list/search_builder.cc',
'browser/ui/views/ash/app_list/search_builder.h',
- 'browser/ui/views/ash/balloon_collection_impl_ash.cc',
- 'browser/ui/views/ash/balloon_collection_impl_ash.h',
'browser/ui/views/ash/brightness_controller_chromeos.cc',
'browser/ui/views/ash/brightness_controller_chromeos.h',
'browser/ui/views/ash/browser_non_client_frame_view_ash.h',
@@ -3595,10 +3595,10 @@
'browser/ui/views/native_constrained_window_aura.cc',
'browser/ui/views/native_constrained_window_win.cc',
'browser/ui/views/notifications/balloon_collection_views.cc',
+ 'browser/ui/views/notifications/balloon_view.cc',
+ 'browser/ui/views/notifications/balloon_view.h',
'browser/ui/views/notifications/balloon_view_host.cc',
'browser/ui/views/notifications/balloon_view_host.h',
- 'browser/ui/views/notifications/balloon_view_views.cc',
- 'browser/ui/views/notifications/balloon_view_views.h',
'browser/ui/views/omnibox/omnibox_view_views.cc',
'browser/ui/views/omnibox/omnibox_view_views.h',
'browser/ui/views/omnibox/omnibox_view_win.cc',