Upstream Android native crash handling changes.

chrome/browser/ui/webui/uber/uber_ui.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
+#include "chrome/browser/profiles/profile.h"

[Mark Mentovai, 2012/04/09 22:55:58]

This too.

+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_controller.h"
 
 // The WebUI class for the uber page (chrome://chrome). It manages the UI for
 // the uber page (navigation bar and so forth) as well as WebUI objects for
 // pages that appear in the uber page.
 class UberUI : public content::WebUIController {
  public:
   explicit UberUI(content::WebUI* web_ui);
   virtual ~UberUI();
 
@@ skipping 15 matching lines @@
 
   // Creates and stores a WebUI for the given URL.
   void RegisterSubpage(const std::string& page_url);
 
   // The WebUI*s in this map are owned.
   SubpageMap sub_uis_;
 
   DISALLOW_COPY_AND_ASSIGN(UberUI);
 };
 
-class UberFrameUI : public content::WebUIController {
+class UberFrameUI : public content::NotificationObserver,
+                    public content::WebUIController {
  public:
   explicit UberFrameUI(content::WebUI* web_ui);
   virtual ~UberFrameUI();
 
  private:
+  // content::NotificationObserver implementation.
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  content::NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(UberFrameUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_