mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Linter fixes

Browse source
This commit is contained in:
Paul Betts 2015-07-09 17:00:19 -07:00
commit 39c6e2d2e5
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window.cc
View file

@ -8,6 +8,10 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#if defined(OS_WIN)
#include <shlobj.h>
#endif
#include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_context.h"
#include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/browser.h" #include "atom/browser/browser.h"
@ -50,7 +54,6 @@
#if defined(OS_WIN) #if defined(OS_WIN)
#include "ui/gfx/switches.h" #include "ui/gfx/switches.h"
#include <shlobj.h>
#endif #endif
using content::NavigationEntry; using content::NavigationEntry;

6
atom/renderer/atom_renderer_client.cc
View file

@ -92,8 +92,10 @@ void AtomRendererClient::WebKitInitialized() {
blink::WebCustomElement::addEmbedderCustomElementName("browserplugin"); blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
#if defined(OS_WIN) #if defined(OS_WIN)
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::CommandLine* command_line =
base::string16 explicit_app_id = command_line->GetSwitchValueNative(switches::kAppUserModelId); base::CommandLine::ForCurrentProcess();
base::string16 explicit_app_id =
command_line->GetSwitchValueNative(switches::kAppUserModelId);
if (explicit_app_id.length() > 0) { if (explicit_app_id.length() > 0) {
SetCurrentProcessExplicitAppUserModelID(explicit_app_id.c_str()); SetCurrentProcessExplicitAppUserModelID(explicit_app_id.c_str());