Skip to content

Commit

Permalink
Appease the almighty linter
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound authored and zcbenz committed Dec 5, 2017
1 parent d9359d8 commit d1aded2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions atom/browser/api/atom_api_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#define ATOM_BROWSER_API_ATOM_API_SESSION_H_

#include <string>
#include <vector>

#include "atom/browser/api/trackable_object.h"
#include "atom/browser/atom_blob_reader.h"
Expand Down
1 change: 0 additions & 1 deletion atom/browser/api/atom_api_web_contents.h
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
const std::vector<base::string16>& labels);

private:

uint32_t GetNextRequestId() {
return ++request_id_;
}
Expand Down
7 changes: 5 additions & 2 deletions atom/browser/web_contents_preferences.cc
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,11 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
}

v8::Isolate* isolate = v8::Isolate::GetCurrent();
mate::Handle<atom::api::WebContents> api_web_contents = atom::api::WebContents::CreateFrom(isolate, web_contents);
for (auto preloadPath : atom::api::Session::CreateFrom(isolate, api_web_contents.get()->GetBrowserContext())->GetPreloads()) {
mate::Handle<atom::api::WebContents> api_web_contents =
atom::api::WebContents::CreateFrom(isolate, web_contents);
auto session = atom::api::Session::CreateFrom(
isolate, api_web_contents.get()->GetBrowserContext());
for (auto preloadPath : session->GetPreloads()) {
if (base::FilePath(preloadPath).IsAbsolute())
command_line->AppendSwitchNative(switches::kSessionPreloadScript,
preloadPath);
Expand Down

0 comments on commit d1aded2

Please sign in to comment.