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

Cleanup code

Browse source
This commit is contained in:
Cheng Zhao 2015-07-14 03:23:19 +08:00
parent 0c7c6ddcc9
commit 9e8a118d10
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/native_window.cc
View file

@ -393,12 +393,11 @@ void NativeWindow::AppendExtraCommandLineSwitches(
base::DoubleToString(zoom_factor_)); base::DoubleToString(zoom_factor_));
#if defined(OS_WIN) #if defined(OS_WIN)
PWSTR explicit_app_id; // Append --app-user-model-id.
PWSTR current_app_id;
if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&explicit_app_id))) { if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
base::string16 appId = base::string16(explicit_app_id); command_line->AppendSwitchNative(switches::kAppUserModelId, current_app_id);
command_line->AppendSwitchNative(switches::kAppUserModelId, appId); CoTaskMemFree(current_app_id);
CoTaskMemFree(explicit_app_id);
} }
#endif #endif

20
atom/renderer/atom_renderer_client.cc
View file

@ -91,17 +91,6 @@ void AtomRendererClient::WebKitInitialized() {
blink::WebCustomElement::addEmbedderCustomElementName("webview"); blink::WebCustomElement::addEmbedderCustomElementName("webview");
blink::WebCustomElement::addEmbedderCustomElementName("browserplugin"); blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
#if defined(OS_WIN)
base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
base::string16 explicit_app_id =
command_line->GetSwitchValueNative(switches::kAppUserModelId);
if (explicit_app_id.length() > 0) {
SetCurrentProcessExplicitAppUserModelID(explicit_app_id.c_str());
}
#endif
node_bindings_->Initialize(); node_bindings_->Initialize();
node_bindings_->PrepareMessageLoop(); node_bindings_->PrepareMessageLoop();
@ -117,6 +106,15 @@ void AtomRendererClient::WebKitInitialized() {
void AtomRendererClient::RenderThreadStarted() { void AtomRendererClient::RenderThreadStarted() {
content::RenderThread::Get()->AddObserver(this); content::RenderThread::Get()->AddObserver(this);
#if defined(OS_WIN)
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
base::string16 app_id =
command_line->GetSwitchValueNative(switches::kAppUserModelId);
if (!app_id.empty()) {
SetCurrentProcessExplicitAppUserModelID(app_id.c_str());
}
#endif
} }
void AtomRendererClient::RenderFrameCreated( void AtomRendererClient::RenderFrameCreated(