chore: fix code style

electron · Aug 11, 2020 · 7cec63a · 7cec63a
1 parent 2547404
commit 7cec63a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -1763,13 +1763,12 @@ void WebContents::EnableDeviceEmulation(
 
   auto* frame_host = web_contents()->GetMainFrame();
   if (frame_host) {
-    auto* widget_host =
-        frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
-    if (widget_host) {
-      auto* impl = content::RenderWidgetHostImpl::FromID(
-          widget_host->GetProcess()->GetID(), widget_host->GetRoutingID());
-
-      auto& frame_widget = impl->GetAssociatedFrameWidget();
+    auto* widget_host_impl =
+        frame_host ? static_cast<content::RenderWidgetHostImpl*>(
+                         frame_host->GetView()->GetRenderWidgetHost())
+                   : nullptr;
+    if (widget_host_impl) {
+      auto& frame_widget = widget_host_impl->GetAssociatedFrameWidget();
       frame_widget->EnableDeviceEmulation(params);
     }
   }
@@ -1781,13 +1780,12 @@ void WebContents::DisableDeviceEmulation() {
 
   auto* frame_host = web_contents()->GetMainFrame();
   if (frame_host) {
-    auto* widget_host =
-        frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
-    if (widget_host) {
-      auto* impl = content::RenderWidgetHostImpl::FromID(
-          widget_host->GetProcess()->GetID(), widget_host->GetRoutingID());
-
-      auto& frame_widget = impl->GetAssociatedFrameWidget();
+    auto* widget_host_impl =
+        frame_host ? static_cast<content::RenderWidgetHostImpl*>(
+                         frame_host->GetView()->GetRenderWidgetHost())
+                   : nullptr;
+    if (widget_host_impl) {
+      auto& frame_widget = widget_host_impl->GetAssociatedFrameWidget();
       frame_widget->DisableDeviceEmulation();
     }
   }

diff --git a/shell/browser/ui/x/window_state_watcher.cc b/shell/browser/ui/x/window_state_watcher.cc
@@ -55,11 +55,9 @@ void WindowStateWatcher::DidProcessXEvent(x11::Event* x11_event) {
 }
 
 bool WindowStateWatcher::IsWindowStateEvent(x11::Event* x11_event) const {
-  return (x11_event->As<x11::PropertyNotifyEvent>() &&
-          x11_event->As<x11::PropertyNotifyEvent>()->atom ==
-              window_state_atom_ &&
-          static_cast<uint32_t>(
-              x11_event->As<x11::PropertyNotifyEvent>()->window) == widget_);
+  auto* property = x11_event->As<x11::PropertyNotifyEvent>();
+  return (property && property->atom == window_state_atom_ &&
+          static_cast<uint32_t>(property->window) == widget_);
 }
 
 }  // namespace electron