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

Side by Side Diff: ash/wm/frame_painter.cc

Issue 10005030: Merge 131030 - Ash: Update window transparency values (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1084/src/
Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/frame_painter.h" 5 #include "ash/wm/frame_painter.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/logging.h" // DCHECK 10 #include "base/logging.h" // DCHECK
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return window && 115 return window &&
116 window->IsVisible() && 116 window->IsVisible() &&
117 window->type() == aura::client::WINDOW_TYPE_NORMAL; 117 window->type() == aura::client::WINDOW_TYPE_NORMAL;
118 } 118 }
119 119
120 } // namespace 120 } // namespace
121 121
122 namespace ash { 122 namespace ash {
123 123
124 // static 124 // static
125 int FramePainter::kActiveWindowOpacity = 255; 125 int FramePainter::kActiveWindowOpacity = 230; // "Linus-approved" values
126 int FramePainter::kInactiveWindowOpacity = 166; 126 int FramePainter::kInactiveWindowOpacity = 204;
127 int FramePainter::kSoloWindowOpacity = 230; 127 int FramePainter::kSoloWindowOpacity = 51;
128 std::set<FramePainter*>* FramePainter::instances_ = NULL; 128 std::set<FramePainter*>* FramePainter::instances_ = NULL;
129 129
130 /////////////////////////////////////////////////////////////////////////////// 130 ///////////////////////////////////////////////////////////////////////////////
131 // FramePainter, public: 131 // FramePainter, public:
132 132
133 FramePainter::FramePainter() 133 FramePainter::FramePainter()
134 : frame_(NULL), 134 : frame_(NULL),
135 window_icon_(NULL), 135 window_icon_(NULL),
136 size_button_(NULL), 136 size_button_(NULL),
137 close_button_(NULL), 137 close_button_(NULL),
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 if (*it != ignore && IsVisibleNormalWindow(*it)) { 525 if (*it != ignore && IsVisibleNormalWindow(*it)) {
526 normal_window_count++; 526 normal_window_count++;
527 if (normal_window_count > 1) 527 if (normal_window_count > 1)
528 return false; 528 return false;
529 } 529 }
530 } 530 }
531 return normal_window_count == 1; 531 return normal_window_count == 1;
532 } 532 }
533 533
534 } // namespace ash 534 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698