Make getters of NativeAppWindowViews public

Remove AthenaNativeAppWindowViews

BUG=None

Review URL: https://codereview.chromium.org/721873007

Cr-Commit-Position: refs/heads/master@{#304150}

4 files changed, 3 insertions, 44 deletions

diff --git a/athena/athena.gyp b/athena/athena.gyp
index 73a69d8..a0b0449 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -182,8 +182,6 @@
         'extensions/athena_constrained_window_views_client.h',
         'extensions/athena_javascript_native_dialog_factory.cc',
         'extensions/athena_javascript_native_dialog_factory.h',
-        'extensions/athena_native_app_window_views.cc',
-        'extensions/athena_native_app_window_views.h',
         'extensions/extension_app_model_builder.cc',
         'extensions/extensions_delegate.cc',
         'extensions/pubilc/apps_search_controller_factory.h',
diff --git a/athena/extensions/athena_app_window_client_base.cc b/athena/extensions/athena_app_window_client_base.cc
index fc02fb9..ab0d5f0 100644
--- a/athena/extensions/athena_app_window_client_base.cc
+++ b/athena/extensions/athena_app_window_client_base.cc
@@ -6,10 +6,10 @@
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
-#include "athena/extensions/athena_native_app_window_views.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
 #include "extensions/common/extension.h"
+#include "extensions/components/native_app_window/native_app_window_views.h"
 
 namespace athena {
 
@@ -22,10 +22,10 @@ AthenaAppWindowClientBase::~AthenaAppWindowClientBase() {
 extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow(
     extensions::AppWindow* app_window,
     extensions::AppWindow::CreateParams* params) {
-  AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews;
+  auto* native_window = new native_app_window::NativeAppWindowViews;
   native_window->Init(app_window, *params);
   ActivityFactory::Get()->CreateAppActivity(app_window->extension_id(),
-                                            native_window->GetWebView());
+                                            native_window->web_view());
   if (params->focused) {
     // Windows are created per default at the top of the stack. If - at this
     // point of initialization - it is has been moved into a different Z-order
diff --git a/athena/extensions/athena_native_app_window_views.cc b/athena/extensions/athena_native_app_window_views.cc
deleted file mode 100644
index 866a9c4..0000000
--- a/athena/extensions/athena_native_app_window_views.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "athena/extensions/athena_native_app_window_views.h"
-
-namespace athena {
-
-views::WebView* AthenaNativeAppWindowViews::GetWebView() {
-  return web_view();
-}
-
-}  // namespace athena
diff --git a/athena/extensions/athena_native_app_window_views.h b/athena/extensions/athena_native_app_window_views.h
deleted file mode 100644
index 3d20276..0000000
--- a/athena/extensions/athena_native_app_window_views.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ATHENA_EXTENSIONS_ATHENA_NATIVE_APP_WINDOW_VIEWS_H_
-#define ATHENA_EXTENSIONS_ATHENA_NATIVE_APP_WINDOW_VIEWS_H_
-
-#include "extensions/components/native_app_window/native_app_window_views.h"
-
-namespace athena {
-
-class AthenaNativeAppWindowViews
-    : public native_app_window::NativeAppWindowViews {
- public:
-  AthenaNativeAppWindowViews() {}
-  ~AthenaNativeAppWindowViews() override {}
-
-  views::WebView* GetWebView();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AthenaNativeAppWindowViews);
-};
-
-}  // namespace athena
-
-#endif  // ATHENA_EXTENSIONS_ATHENA_NATIVE_APP_WINDOW_VIEWS_H_