Fix build due to conflict

chrome/browser/chromeos/notifications/balloon_view_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_
 #define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_
 #pragma once
 
 #include "chrome/browser/views/notifications/balloon_view_host.h"
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "gfx/native_widget_types.h"
 
-class Value;
 class ListValue;
 class GURL;
 
 namespace chromeos {
 
-typedef Callback1<const Value*>::Type MessageCallback;
+typedef Callback1<const ListValue*>::Type MessageCallback;
 
 class BalloonViewHost : public ::BalloonViewHost {
  public:
   explicit BalloonViewHost(Balloon* balloon) : ::BalloonViewHost(balloon) {}
   virtual ~BalloonViewHost();
 
   // Adds a callback for DOMUI message. Returns true if the callback
   // is succssfully registered, or false otherwise. It fails to add if
   // a callback for given message already exists. The callback object
   // is owned and deleted by callee.
   bool AddDOMUIMessageCallback(const std::string& message,
                                MessageCallback* callback);
 
   // Process DOMUI message.
-  void ProcessDOMUIMessage(const std::string& message,
-                           const ListValue* content,
-                           const GURL& source_url,
-                           int request_id,
-                           bool has_callback);
+  virtual void ProcessDOMUIMessage(const ViewHostMsg_DomMessage_Params& params);
 
  private:
   // A map of message name -> message handling callback.
   typedef std::map<std::string, MessageCallback*> MessageCallbackMap;
   MessageCallbackMap message_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(BalloonViewHost);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_