Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / toolbar / browser_action_test_util_views.cc

diff --git a/src/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/src/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
index ccb6807..8f00bd6 100644 (file)
--- a/src/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
+++ b/src/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
@@ -6,16 +6,20 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_testing_views.h"
+#include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
-#include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/views/widget/widget.h"
 
 namespace {
 
@@ -27,62 +31,60 @@ BrowserActionsContainer* GetContainer(Browser* browser) {
 }  // namespace
 
 int BrowserActionTestUtil::NumberOfBrowserActions() {
-  return GetContainer(browser_)->num_browser_actions();
+  return GetContainer(browser_)->num_toolbar_actions();
 }
 
 int BrowserActionTestUtil::VisibleBrowserActions() {
   return GetContainer(browser_)->VisibleBrowserActions();
 }
 
-ExtensionAction* BrowserActionTestUtil::GetExtensionAction(int index) {
-  return extensions::ExtensionActionManager::Get(browser_->profile())->
-      GetBrowserAction(*GetContainer(browser_)->GetBrowserActionViewAt(index)->
-                       extension());
-}
-
 void BrowserActionTestUtil::InspectPopup(int index) {
-  GetContainer(browser_)->GetBrowserActionViewAt(index)->
-      view_controller()->InspectPopup();
+  ToolbarActionView* view =
+      GetContainer(browser_)->GetToolbarActionViewAt(index);
+  static_cast<ExtensionActionViewController*>(view->view_controller())->
+      InspectPopup();
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
-  return !GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  return !GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetImage(views::Button::STATE_NORMAL).isNull();
 }
 
 gfx::Image BrowserActionTestUtil::GetIcon(int index) {
-  gfx::ImageSkia icon = GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  gfx::ImageSkia icon = GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetIconForTest();
   return gfx::Image(icon);
 }
 
 void BrowserActionTestUtil::Press(int index) {
-  GetContainer(browser_)->GetBrowserActionViewAt(index)->
-      view_controller()->ExecuteActionByUser();
+  GetContainer(browser_)->GetToolbarActionViewAt(index)->
+      view_controller()->ExecuteAction(true);
 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
-  return GetContainer(browser_)->GetBrowserActionViewAt(index)->
-      extension()->id();
+  return GetContainer(browser_)->GetToolbarActionViewAt(index)->
+      view_controller()->GetId();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   base::string16 text;
-  GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetTooltipText(gfx::Point(), &text);
   return base::UTF16ToUTF8(text);
 }
 
 gfx::NativeView BrowserActionTestUtil::GetPopupNativeView() {
-  return GetContainer(browser_)->TestGetPopup()->GetWidget()->GetNativeView();
+  return GetContainer(browser_)->TestGetPopup();
 }
 
 bool BrowserActionTestUtil::HasPopup() {
   return GetContainer(browser_)->TestGetPopup() != NULL;
 }
 
-gfx::Rect BrowserActionTestUtil::GetPopupBounds() {
-  return GetContainer(browser_)->TestGetPopup()->bounds();
+gfx::Size BrowserActionTestUtil::GetPopupSize() {
+  gfx::NativeView popup = GetContainer(browser_)->TestGetPopup();
+  views::Widget* widget = views::Widget::GetWidgetForNativeView(popup);
+  return widget->GetWindowBoundsInScreen().size();
 }
 
 bool BrowserActionTestUtil::HidePopup() {
@@ -91,13 +93,26 @@ bool BrowserActionTestUtil::HidePopup() {
 }
 
 void BrowserActionTestUtil::SetIconVisibilityCount(size_t icons) {
-  GetContainer(browser_)->TestSetIconVisibilityCount(icons);
+  extensions::ExtensionToolbarModel::Get(browser_->profile())->
+      SetVisibleIconCount(icons);
+}
+
+// static
+void BrowserActionTestUtil::DisableAnimations() {
+  BrowserActionsContainer::disable_animations_during_testing_ = true;
+}
+
+// static
+void BrowserActionTestUtil::EnableAnimations() {
+  BrowserActionsContainer::disable_animations_during_testing_ = false;
 }
 
+// static
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight);
 }
 
+// static
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight);
 }