ash: Update window frame art and transparency values

Per kuscher@ we'd like to try: * Active and inactive windows 100% opaque * Solo window 30% opaque * New art assets for active and inactive window frames BUG=137340 TEST=visual, with 2 windows open the active window should have an opaque darker frame and the inactive window should have an opaque lighter frame Review URL: https://chromiumcodereview.appspot.com/10825086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149006 0039d316-1c4b-4281-b951-d872f2087c98
jiongle1 · Jul 30, 2012 · 109acb8 · 109acb8
1 parent 3322792
commit 109acb8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
@@ -120,9 +120,9 @@ bool IsVisibleNormalWindow(aura::Window* window) {
 namespace ash {
 
 // static
-int FramePainter::kActiveWindowOpacity = 230;  // "Linus-approved" values
-int FramePainter::kInactiveWindowOpacity = 204;
-int FramePainter::kSoloWindowOpacity = 51;
+int FramePainter::kActiveWindowOpacity = 255;  // 1.0
+int FramePainter::kInactiveWindowOpacity = 255;  // 1.0
+int FramePainter::kSoloWindowOpacity = 77;  // 0.3
 std::set<FramePainter*>* FramePainter::instances_ = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/chrome/app/theme/default_100_percent/ash/theme_frame_active.png b/chrome/app/theme/default_100_percent/ash/theme_frame_active.png
diff --git a/chrome/app/theme/default_100_percent/ash/theme_frame_default_active.png b/chrome/app/theme/default_100_percent/ash/theme_frame_default_active.png
diff --git a/chrome/app/theme/default_100_percent/ash/theme_frame_default_inactive.png b/chrome/app/theme/default_100_percent/ash/theme_frame_default_inactive.png
diff --git a/chrome/app/theme/default_100_percent/ash/theme_frame_inactive.png b/chrome/app/theme/default_100_percent/ash/theme_frame_inactive.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
@@ -737,8 +737,8 @@
       </if>
       <if expr="pp_ifdef('use_ash')">
         <!-- Ash has a gray frame, Windows uses blue. -->
-        <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="ash/theme_frame_default_active.png" />
-        <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_default_inactive.png" />
+        <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="ash/theme_frame_active.png" />
+        <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive.png" />
         <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito_active.png" />
         <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" />
       </if>