Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Unified Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 7538010: Make BrowserWindow::CreateFindBar non-static so that it can be overridden by Panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove underscore. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 3e76af96ecb8fc8fe48c34f0ebb7da3af4e2fb69..791dba45679a9f4f11b9f9b8efb1d2ced11c736e 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -10,6 +10,8 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/find_bar/find_bar.h"
+#include "chrome/browser/ui/find_bar/find_bar_controller.h"
#include "chrome/browser/ui/panels/panel.h"
#include "chrome/browser/ui/panels/panel_manager.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -24,9 +26,17 @@
#include "content/browser/tab_contents/test_tab_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(OS_MACOSX)
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
+#endif
+
class PanelBrowserTest : public InProcessBrowserTest {
public:
- PanelBrowserTest() : InProcessBrowserTest() { }
+ PanelBrowserTest() : InProcessBrowserTest() {
+#if defined(OS_MACOSX)
+ FindBarBridge::disable_animations_during_testing_ = true;
+#endif
+ }
virtual void SetUpCommandLine(CommandLine* command_line) {
command_line->AppendSwitch(switches::kEnablePanels);
@@ -159,6 +169,14 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreatePanel) {
EXPECT_EQ(0, panel_manager->num_panels());
}
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FindBar) {
+ Panel* panel = CreatePanel("PanelTest", gfx::Rect(0, 0, 400, 400));
+ Browser* browser = panel->browser();
+ browser->ShowFindBar();
+ ASSERT_TRUE(browser->GetFindBarController()->find_bar()->IsFindBarVisible());
+ panel->Close();
+}
+
// TODO(jianli): Investigate and enable it for Mac.
#ifdef OS_MACOSX
#define MAYBE_CreatePanelOnOverflow DISABLED_CreatePanelOnOverflow

Powered by Google App Engine
This is Rietveld 408576698