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

Unified Diff: chrome/browser/ui/ash/shelf_browsertest.cc

Issue 10905080: Exempt status bubble windows from status bar darkening (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make shelf browser test to confirm that status bubble doesn't cause darkening Created 8 years, 3 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
« no previous file with comments | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | chrome/browser/ui/views/status_bubble_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/shelf_browsertest.cc
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6468305ffeae1b4bf4655248d444f7e669284ded
--- /dev/null
+++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -0,0 +1,40 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include "chrome/test/base/in_process_browser_test.h"
sky 2012/09/05 00:11:46 Put this with the rest of the includes and sort.
+
+#include "ash/shell.h"
+#include "ash/wm/shelf_layout_manager.h"
+#include "ash/wm/workspace_controller.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/status_bubble.h"
+
+typedef InProcessBrowserTest ShelfBrowserTest;
+
+// Confirm that a status bubble doesn't cause the shelf to darken.
+IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {
+ ash::Shell* shell = ash::Shell::GetInstance();
+ ash::internal::ShelfLayoutManager* shelf = shell->shelf();
+ EXPECT_TRUE(shelf->IsVisible());
+
+ // Ensure that the browser abuts the shelf.
+ ash::Shell::TestApi(shell).workspace_controller()->SetGridSize(1);
+ const gfx::Rect old_bounds = browser()->window()->GetBounds();
+ const gfx::Rect new_bounds(
+ old_bounds.x(),
+ old_bounds.y(),
+ old_bounds.width(),
+ shelf->GetIdealBounds().y() - old_bounds.y());
+ browser()->window()->SetBounds(new_bounds);
+ EXPECT_FALSE(shelf->window_overlaps_shelf());
+
+ // Show status, which will overlap the shelf by a pixel.
+ browser()->window()->GetStatusBubble()->SetStatus(
+ UTF8ToUTF16("Dummy Status Text"));
+ shelf->UpdateVisibilityState();
+
+ // Ensure that status doesn't cause overlap.
+ EXPECT_FALSE(shelf->window_overlaps_shelf());
+}
« no previous file with comments | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | chrome/browser/ui/views/status_bubble_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698