Get chromeos aura build to run

BUG=None
TEST=None


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

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

6 files changed, 24 insertions, 17 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 6c932f2..6d08b95 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1002,13 +1002,8 @@ void BrowserProcessImpl::CreateIntranetRedirectDetector() {
 }
 
 void BrowserProcessImpl::CreateNotificationUIManager() {
-#if defined(USE_AURA) && defined(OS_CHROMEOS)
-  // TODO(saintlou): Implement notifications.
-  NOTIMPLEMENTED();
-#else
   DCHECK(notification_ui_manager_.get() == NULL);
   notification_ui_manager_.reset(NotificationUIManager::Create(local_state()));
-#endif
   created_notification_ui_manager_ = true;
 }
 
diff --git a/chrome/browser/chromeos/cros_stubs_aura.cc b/chrome/browser/chromeos/cros_stubs_aura.cc
index 373f2e4..265198d 100644
--- a/chrome/browser/chromeos/cros_stubs_aura.cc
+++ b/chrome/browser/chromeos/cros_stubs_aura.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
+#include "chrome/browser/notifications/balloon_collection.h"
 
 namespace chromeos {
 
@@ -221,10 +222,26 @@ void ScreenLocker::InitClass() {
 
 }  // namespace chromeos
 
+class BalloonCollectionStub : public BalloonCollection {
+ public:
+  BalloonCollectionStub() {}
+  virtual ~BalloonCollectionStub() {}
+ private:
+  void Add(const Notification& notification, Profile* profile) {}
+  bool RemoveById(const std::string& id) { return true; }
+  bool RemoveBySourceOrigin(const GURL& source_origin) { return true; }
+  void RemoveAll() {}
+  bool HasSpace() const { return true; }
+  void ResizeBalloon(Balloon* balloon, const gfx::Size& size) {}
+  void SetPositionPreference(PositionPreference position) {}
+  void DisplayChanged() {}
+  void OnBalloonClosed(Balloon* source) {}
+  const Balloons& GetActiveBalloons() { return balloons_; }
+
+  Balloons balloons_;
+};
+
 // static
-BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
-  // TODO(saintlou): As per Ben there is no need for this in Aura.
-  BrowserView* view = new BrowserView(browser);
-  (new BrowserFrame(view))->InitBrowserFrame();
-  return view;
+BalloonCollection* BalloonCollection::Create() {
+  return new BalloonCollectionStub;
 }
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c285f08..888ced4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -117,12 +117,7 @@ void RegisterLocalState(PrefService* local_state) {
   TaskManager::RegisterPrefs(local_state);
   geolocation::RegisterPrefs(local_state);
   BackgroundModeManager::RegisterPrefs(local_state);
-#if defined(USE_AURA) && defined(OS_CHROMEOS)
-  // TODO(saintlou): Implement notifications.
-  NOTIMPLEMENTED();
-#else
   NotificationUIManager::RegisterPrefs(local_state);
-#endif
   PrefProxyConfigService::RegisterPrefs(local_state);
   SSLConfigServiceManager::RegisterPrefs(local_state);
 #if defined(ENABLE_CONFIGURATION_POLICY)
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index c4844e9..48781b7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2533,7 +2533,7 @@ void BrowserView::SetToolbar(ToolbarView* toolbar) {
   }
 }
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
index 76f8174..f4d9b61 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -36,6 +36,7 @@
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/user_agent.h"
 
 namespace {
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6190361..ec5a6d4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -5060,7 +5060,6 @@
             ['exclude', '^browser/chromeos/wm_ipc.cc'],
             ['exclude', '^browser/chromeos/wm_message_listener.cc'],
             ['exclude', '^browser/chromeos/xinput_hierarchy_changed_event_listener.cc'],
-            ['exclude', '^browser/notifications/notification_ui_manager.cc'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
             ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
             ['include', '^browser/ui/views/handle_web_keyboard_event.h'],