Merge 255276 "RendererWebColorChooserImpl shouldn't be destroyed..."

content/renderer/renderer_webcolorchooser_impl.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 CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_
 #define CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 18 matching lines @@
   virtual ~RendererWebColorChooserImpl();
 
   virtual void setSelectedColor(const blink::WebColor);
   virtual void endChooser();
 
   void Open(SkColor initial_color,
             const std::vector<content::ColorSuggestion>& suggestions);
 
   blink::WebColorChooserClient* client() { return client_; }
 
+  // Don't destroy the RendererWebColorChooserImpl when the RenderViewImpl goes
+  // away. RendererWebColorChooserImpl is owned by
+  // blink::ColorChooserUIController.
+  virtual void OnDestruct() OVERRIDE {}
+
  private:
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnDidChooseColorResponse(int color_chooser_id, SkColor color);
   void OnDidEndColorChooser(int color_chooser_id);
 
   int identifier_;
   blink::WebColorChooserClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererWebColorChooserImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_