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

Unified Diff: ash/wm/frame_painter.cc

Issue 10857021: Prepare a bunch of ash tests for workspace2. With Workspace2 you can't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « ash/wm/activation_controller_unittest.cc ('k') | ash/wm/frame_painter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/frame_painter.cc
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 50509068e79609816eabe75f44f87c46d6a10126..6241711ee0f4c5adb7817942acf273992d816087 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -592,6 +592,9 @@ int FramePainter::GetHeaderOpacity(HeaderMode header_mode,
// static
bool FramePainter::UseSoloWindowHeader() {
+ if (!instances_)
+ return false; // Return value shouldn't matter.
+
int window_count = 0;
for (std::set<FramePainter*>::const_iterator it = instances_->begin();
it != instances_->end();
@@ -610,6 +613,9 @@ bool FramePainter::UseSoloWindowHeader() {
// static
void FramePainter::SchedulePaintForSoloWindow() {
+ if (!instances_)
+ return;
+
for (std::set<FramePainter*>::const_iterator it = instances_->begin();
it != instances_->end();
++it) {
« no previous file with comments | « ash/wm/activation_controller_unittest.cc ('k') | ash/wm/frame_painter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698