diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 04:28:37 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 04:28:37 +0000 |
| commit | 932cf113991a891486faaba65f2d266afa023906 (patch) | |
| tree | 414e932123fb1ba19e287f1c404c1a2562e1c3e6 /ash/wm/frame_painter.cc | |
| parent | ff5692ed360a1e71ca3ba7d3be29a930f7e25dec (diff) | |
| download | chromium_src-932cf113991a891486faaba65f2d266afa023906.zip chromium_src-932cf113991a891486faaba65f2d266afa023906.tar.gz chromium_src-932cf113991a891486faaba65f2d266afa023906.tar.bz2 | |
Prepare a bunch of ash tests for workspace2. With Workspace2 you can't
add to the default container, instead you need to go through the
StackingClient.
BUG=137342
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10857021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/frame_painter.cc')
| -rw-r--r-- | ash/wm/frame_painter.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index 5050906..6241711 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) { |