Merge pull request electron-archive#25 from brightray/chrome37

Upgrade to Chrome37

browser/views/window_views.cc

@@ -26,11 +26,11 @@ class WidgetDelegateView : public views::WidgetDelegateView {
   virtual views::View* GetContentsView() OVERRIDE { return this; }
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual bool CanMaximize() const OVERRIDE { return true; }
-  virtual base::string16 GetWindowTitle() const OVERRIDE { 
-    return base::ASCIIToUTF16("Brightray Example");  
+  virtual base::string16 GetWindowTitle() const OVERRIDE {
+    return base::ASCIIToUTF16("Brightray Example");
   }
-  virtual gfx::Size GetPreferredSize() OVERRIDE { return gfx::Size(800, 600); }
-  virtual gfx::Size GetMinimumSize() OVERRIDE { return gfx::Size(100, 100); }
+  virtual gfx::Size GetPreferredSize() const OVERRIDE { return gfx::Size(800, 600); }
+  virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(100, 100); }
 
  private:
   scoped_ptr<WindowViews> window_;
@@ -50,7 +50,6 @@ WindowViews::WindowViews(brightray::BrowserContext* browser_context)
   auto delegate_view = new WidgetDelegateView(make_scoped_ptr(this).Pass());
 
   views::Widget::InitParams params;
-  params.top_level = true;
   params.delegate = delegate_view;
   widget_->Init(params);
   delegate_view->AddChildView(inspectable_web_contents()->GetView()->GetView());

renderer/render_view_observer.cc

@@ -36,11 +36,7 @@ RenderViewObserver::RenderViewObserver(content::RenderView *render_view)
 RenderViewObserver::~RenderViewObserver() {
 }
 
-void RenderViewObserver::DidClearWindowObject(blink::WebLocalFrame* frame, int world_id) {
-  // Only inject into the main world.
-  if (world_id != 0)
-    return;
-
+void RenderViewObserver::DidClearWindowObject(blink::WebLocalFrame* frame) {
   GURL url = frame->document().url();
   if (!url.SchemeIs("http") ||
       !url.DomainIs("adam.roben.org") ||

renderer/render_view_observer.h

@@ -11,7 +11,7 @@ class RenderViewObserver : content::RenderViewObserver {
 private:
   ~RenderViewObserver();
 
-  virtual void DidClearWindowObject(blink::WebLocalFrame* frame, int world_id) OVERRIDE;
+  virtual void DidClearWindowObject(blink::WebLocalFrame* frame) OVERRIDE;
 };
 
 }