Cleanup NativeAppWindowViews

Quick cleanup for NativeAppWindowViews in preparation for Layout
changes in http://crbug.com/1005568.

BUG=

Change-Id: I7fcc633917ce81496750740501a1ca1b88edf0b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819913
Commit-Queue: Robert Liao <robliao@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Auto-Submit: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699159}

extensions/components/native_app_window/native_app_window_views.cc

@@ -19,22 +19,15 @@
 #include "ui/aura/window.h"
 #endif
 
-using extensions::AppWindow;
-
 namespace native_app_window {
 
-NativeAppWindowViews::NativeAppWindowViews()
-    : app_window_(NULL),
-      web_view_(NULL),
-      widget_(NULL),
-      frameless_(false),
-      resizable_(false) {
-}
+NativeAppWindowViews::NativeAppWindowViews() = default;
 
-void NativeAppWindowViews::Init(AppWindow* app_window,
-                                const AppWindow::CreateParams& create_params) {
+void NativeAppWindowViews::Init(
+    extensions::AppWindow* app_window,
+    const extensions::AppWindow::CreateParams& create_params) {
   app_window_ = app_window;
-  frameless_ = create_params.frame == AppWindow::FRAME_NONE;
+  frameless_ = create_params.frame == extensions::AppWindow::FRAME_NONE;
   resizable_ = create_params.resizable;
   size_constraints_.set_minimum_size(
       create_params.GetContentMinimumSize(gfx::Insets()));
@@ -50,7 +43,7 @@ void NativeAppWindowViews::Init(AppWindow* app_window,
 }
 
 NativeAppWindowViews::~NativeAppWindowViews() {
-  web_view_->SetWebContents(NULL);
+  web_view_->SetWebContents(nullptr);
 }
 
 void NativeAppWindowViews::OnCanHaveAlphaEnabledChanged() {
@@ -58,8 +51,8 @@ void NativeAppWindowViews::OnCanHaveAlphaEnabledChanged() {
 }
 
 void NativeAppWindowViews::InitializeWindow(
-    AppWindow* app_window,
-    const AppWindow::CreateParams& create_params) {
+    extensions::AppWindow* app_window,
+    const extensions::AppWindow::CreateParams& create_params) {
   // Stub implementation. See also ChromeNativeAppWindowViews.
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
@@ -179,8 +172,8 @@ gfx::NativeView NativeAppWindowViews::GetHostView() const {
 
 gfx::Point NativeAppWindowViews::GetDialogPosition(const gfx::Size& size) {
   gfx::Size app_window_size = widget_->GetWindowBoundsInScreen().size();
-  return gfx::Point(app_window_size.width() / 2 - size.width() / 2,
-                    app_window_size.height() / 2 - size.height() / 2);
+  return gfx::Point((app_window_size.width() - size.width()) / 2,
+                    (app_window_size.height() - size.height()) / 2);
 }
 
 gfx::Size NativeAppWindowViews::GetMaximumDialogSize() {
@@ -323,8 +316,8 @@ void NativeAppWindowViews::Layout() {
 void NativeAppWindowViews::ViewHierarchyChanged(
     const views::ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
-    web_view_ = new views::WebView(NULL);
-    AddChildView(web_view_);
+    DCHECK(!web_view_);
+    web_view_ = AddChildView(std::make_unique<views::WebView>(nullptr));
     web_view_->SetWebContents(app_window_->web_contents());
   }
 }
@@ -345,7 +338,8 @@ void NativeAppWindowViews::OnFocus() {
 
 void NativeAppWindowViews::SetFullscreen(int fullscreen_types) {
   // Stub implementation. See also ChromeNativeAppWindowViews.
-  widget_->SetFullscreen(fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
+  widget_->SetFullscreen(fullscreen_types !=
+                         extensions::AppWindow::FULLSCREEN_TYPE_NONE);
 }
 
 bool NativeAppWindowViews::IsFullscreenOrPending() const {
@@ -367,7 +361,8 @@ void NativeAppWindowViews::UpdateDraggableRegions(
   if (!frameless_)
     return;
 
-  draggable_region_.reset(AppWindow::RawDraggableRegionsToSkRegion(regions));
+  draggable_region_.reset(
+      extensions::AppWindow::RawDraggableRegionsToSkRegion(regions));
   OnViewWasResized();
 }
 

extensions/components/native_app_window/native_app_window_views.h

@@ -158,14 +158,14 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   // Informs modal dialogs that they need to update their positions.
   void OnViewWasResized();
 
-  extensions::AppWindow* app_window_;  // Not owned.
-  views::WebView* web_view_;
-  views::Widget* widget_;
+  extensions::AppWindow* app_window_ = nullptr;  // Not owned.
+  views::WebView* web_view_ = nullptr;
+  views::Widget* widget_ = nullptr;
 
   std::unique_ptr<SkRegion> draggable_region_;
 
-  bool frameless_;
-  bool resizable_;
+  bool frameless_ = false;
+  bool resizable_ = false;
   extensions::SizeConstraints size_constraints_;
 
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;