Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / page_action_with_badge_view.cc

diff --git a/src/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/src/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
index fa761fa..bc16433 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
+++ b/src/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
@@ -4,9 +4,8 @@
 
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
-#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "ui/accessibility/ax_view_state.h"
 
 using content::WebContents;
@@ -15,7 +14,6 @@ PageActionWithBadgeView::PageActionWithBadgeView(
     PageActionImageView* image_view) {
   image_view_ = image_view;
   AddChildView(image_view_);
-  LocationBarView::InitTouchableLocationBarChildView(this);
 }
 
 void PageActionWithBadgeView::GetAccessibleState(
@@ -24,8 +22,8 @@ void PageActionWithBadgeView::GetAccessibleState(
 }
 
 gfx::Size PageActionWithBadgeView::GetPreferredSize() {
-  return gfx::Size(extensions::IconsInfo::kPageActionIconMaxSize,
-                   extensions::IconsInfo::kPageActionIconMaxSize);
+  return gfx::Size(ExtensionAction::kPageActionIconMaxSize,
+                   ExtensionAction::kPageActionIconMaxSize);
 }
 
 void PageActionWithBadgeView::Layout() {