Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / shell / content_client / shell_browser_main_parts.cc

diff --git a/src/ash/shell/content_client/shell_browser_main_parts.cc b/src/ash/shell/content_client/shell_browser_main_parts.cc
index 9d088b5..7223920 100644 (file)
--- a/src/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/src/ash/shell/content_client/shell_browser_main_parts.cc
@@ -5,7 +5,6 @@
 #include "ash/shell/content_client/shell_browser_main_parts.h"
 
 #include "ash/ash_switches.h"
-#include "ash/content_support/inject.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell/shell_delegate_impl.h"
@@ -23,16 +22,15 @@
 #include "content/shell/browser/shell_net_log.h"
 #include "net/base/net_module.h"
 #include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center.h"
-#include "ui/views/corewm/wm_state.h"
-#include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/test_views_delegate.h"
+#include "ui/wm/core/wm_state.h"
 
 #if defined(USE_X11)
 #include "ui/events/x/touch_factory_x11.h"
@@ -100,11 +98,11 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
 }
 
 void ShellBrowserMainParts::ToolkitInitialized() {
-  wm_state_.reset(new views::corewm::WMState);
+  wm_state_.reset(new wm::WMState);
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
-  net_log_.reset(new content::ShellNetLog());
+  net_log_.reset(new content::ShellNetLog("ash_shell"));
   browser_context_.reset(new content::ShellBrowserContext(
       false, net_log_.get()));
 
@@ -124,7 +122,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 #endif
 
   ash::Shell::CreateInstance(delegate_);
-  ash::InitContentSupport();
   delegate_->set_browser_context(browser_context_.get());
   ash::Shell::GetInstance()->CreateShelf();
   ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
@@ -137,10 +134,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 
   ash::shell::InitWindowTypeLauncher();
 
-  Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper(
-      false /* is_guest */);
-
-  ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show();
+  ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {