Simplify the check for web_frame_widget
authorCheng Zhao <zcbenz@gmail.com>
Mon, 9 May 2016 10:37:38 +0000 (19:37 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 13 May 2016 02:11:50 +0000 (11:11 +0900)
atom/renderer/atom_renderer_client.cc

index 9a5aa691c2f77f0a41ad1fb8cf9e77855157340a..d04e028e20df72c70daeae103a3fbd48f43036f9 100644 (file)
@@ -141,24 +141,23 @@ void AtomRendererClient::RenderFrameCreated(
 }
 
 void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
-  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
+  new printing::PrintWebViewHelper(render_view);
+  new AtomRenderViewObserver(render_view, this);
+
   blink::WebFrameWidget* web_frame_widget = render_view->GetWebFrameWidget();
+  if (!web_frame_widget)
+    return;
+
+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   if (cmd->HasSwitch(switches::kGuestInstanceID)) {  // webview.
-    if (web_frame_widget) {
-      web_frame_widget->setBaseBackgroundColor(SK_ColorTRANSPARENT);
-    }
+    web_frame_widget->setBaseBackgroundColor(SK_ColorTRANSPARENT);
   } else {  // normal window.
     // If backgroundColor is specified then use it.
     std::string name = cmd->GetSwitchValueASCII(switches::kBackgroundColor);
     // Otherwise use white background.
     SkColor color = name.empty() ? SK_ColorWHITE : ParseHexColor(name);
-    if (web_frame_widget) {
-      web_frame_widget->setBaseBackgroundColor(color);
-    }
+    web_frame_widget->setBaseBackgroundColor(color);
   }
-
-  new printing::PrintWebViewHelper(render_view);
-  new AtomRenderViewObserver(render_view, this);
 }
 
 blink::WebSpeechSynthesizer* AtomRendererClient::OverrideSpeechSynthesizer(