Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / apps / chrome_app_window_delegate.cc

diff --git a/src/chrome/browser/ui/apps/chrome_app_window_delegate.cc b/src/chrome/browser/ui/apps/chrome_app_window_delegate.cc
index 7f0e066..3a72af3 100644 (file)
--- a/src/chrome/browser/ui/apps/chrome_app_window_delegate.cc
+++ b/src/chrome/browser/ui/apps/chrome_app_window_delegate.cc
@@ -22,7 +22,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_view.h"
+#include "extensions/common/constants.h"
 
 #if defined(USE_ASH)
 #include "ash/shelf/shelf_constants.h"
@@ -225,7 +225,7 @@ void ChromeAppWindowDelegate::RequestMediaAccessPermission(
 
 int ChromeAppWindowDelegate::PreferredIconSize() {
 #if defined(USE_ASH)
-  return ash::kShelfPreferredSize;
+  return ash::kShelfSize;
 #else
   return extension_misc::EXTENSION_ICON_SMALL;
 #endif
@@ -244,5 +244,5 @@ void ChromeAppWindowDelegate::SetWebContentsBlocked(
 
 bool ChromeAppWindowDelegate::IsWebContentsVisible(
     content::WebContents* web_contents) {
-  return platform_util::IsVisible(web_contents->GetView()->GetNativeView());
+  return platform_util::IsVisible(web_contents->GetNativeView());
 }