Merge pull request #112 from atom/devtools-load-network-resources

Fix networking requests not loading in devtools
electron · Jun 5, 2015 · 9cc7d7f · 9cc7d7f
2 parents 9e50dd7 + c4cf700
commit 9cc7d7f
Show file tree

Hide file tree

Showing 18 changed files with 537 additions and 370 deletions.
diff --git a/browser/browser_context.cc b/browser/browser_context.cc
@@ -33,11 +33,11 @@ class BrowserContext::ResourceContext : public content::ResourceContext {
   }
 
  private:
-  virtual net::HostResolver* GetHostResolver() override {
+  net::HostResolver* GetHostResolver() override {
     return getter_->host_resolver();
   }
 
-  virtual net::URLRequestContext* GetRequestContext() override {
+  net::URLRequestContext* GetRequestContext() override {
     return getter_->GetURLRequestContext();
   }
 

diff --git a/browser/browser_context.h b/browser/browser_context.h
@@ -40,9 +40,9 @@ class BrowserContext : public content::BrowserContext,
   virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
 
   // URLRequestContextGetter::Delegate:
-  virtual net::NetworkDelegate* CreateNetworkDelegate() override;
+  net::NetworkDelegate* CreateNetworkDelegate() override;
 
-  virtual base::FilePath GetPath() const override;
+  base::FilePath GetPath() const override;
 
  private:
   class ResourceContext;

diff --git a/browser/browser_main_parts.h b/browser/browser_main_parts.h
@@ -39,12 +39,12 @@ class BrowserMainParts : public content::BrowserMainParts {
 
  protected:
   // content::BrowserMainParts:
-  virtual void PreEarlyInitialization() override;
-  virtual void ToolkitInitialized() override;
-  virtual void PreMainMessageLoopStart() override;
-  virtual void PreMainMessageLoopRun() override;
-  virtual void PostMainMessageLoopRun() override;
-  virtual int PreCreateThreads() override;
+  void PreEarlyInitialization() override;
+  void ToolkitInitialized() override;
+  void PreMainMessageLoopStart() override;
+  void PreMainMessageLoopRun() override;
+  void PostMainMessageLoopRun() override;
+  int PreCreateThreads() override;
 
   // Subclasses should override this to provide their own BrowserContxt
   // implementation. The caller takes ownership of the returned object.