Supprot V2 app: step1

athena/main/athena_launcher.cc

 // 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/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extension_app_model_builder.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
+#include "athena/main/athena_views_delegate.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/screen/public/screen_manager.h"
-#include "athena/screen/public/screen_manager.h"
 #include "athena/system/public/system_ui.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "athena/wm/public/window_manager.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/native_theme/native_theme_switches.h"
-#include "ui/views/views_delegate.h"
 #include "ui/wm/core/visibility_controller.h"
 
 #if defined(USE_X11)
 #include "ui/events/x/touch_factory_x11.h"
 #endif
 
 namespace athena {
 struct AthenaEnvState;
 }
 
@@ skipping 27 matching lines @@
   }
 
  private:
   virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE {
     HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds);
   }
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver);
 };
 
-class AthenaViewsDelegate : public views::ViewsDelegate {
- public:
-  AthenaViewsDelegate() {}
-  virtual ~AthenaViewsDelegate() {}
-
- private:
-  // views::ViewsDelegate:
-  virtual void OnBeforeWidgetInit(
-      views::Widget::InitParams* params,
-      views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
-    params->context = athena::ScreenManager::Get()->GetContext();
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
-};
-
 void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
   athena::AthenaEnv::Create();
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   // Force showing in the experimental app-list view.
   command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
   command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
 #if defined(USE_X11)
@@ skipping 54 matching lines @@
   athena::SystemUI::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::ExtensionsDelegate::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena