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

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

Issue 8503037: Fix the problem that notifications and panels overlap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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/base_panel_browser_test.cc
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index 037a52f5f4fbfb4281267e882b77d79ff0cebd43..6cb2e36f10c78df23a62ffc7898987b39dfb84ac 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -174,7 +174,12 @@ void BasePanelBrowserTest::SetUpOnMainThread() {
mock_auto_hiding_desktop_bar_ = new MockAutoHidingDesktopBarImpl(
panel_manager);
panel_manager->set_auto_hiding_desktop_bar(mock_auto_hiding_desktop_bar_);
- panel_manager->SetWorkAreaForTesting(testing_work_area_);
+ // The subclass might override testing_work_area_ to make it empty so that
+ // we will not provide our own testing work area. This is used in testing
+ // the interaction with desktop notification which does not have testing
+ // working area hook up.
+ if (!testing_work_area_.IsEmpty())
+ panel_manager->SetWorkAreaForTesting(testing_work_area_);
panel_manager->enable_auto_sizing(false);
panel_manager->remove_delays_for_testing();
// This is needed so the subsequently created panels can be activated.

Powered by Google App Engine
This is Rietveld 408576698