Use white header for app windows part #2

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
@@ skipping 86 matching lines @@
   // Paints the header background when the frame is in immersive fullscreen and
   // tab light bar is visible.
   void PaintImmersiveLightbarStyleHeader(gfx::Canvas* canvas);
 
   void PaintToolbarBackground(gfx::Canvas* canvas);
 
   // Windows without a toolbar need to draw their own line under the header,
   // above the content area.
   void PaintContentEdge(gfx::Canvas* canvas);
 
-  // Returns the id of the header frame image based on the browser type,
-  // activation state and incognito mode.
-  int GetThemeFrameImageId() const;
+  // Sets |frame_image_id| and |frame_image_overlay_id| to the ids of the header
+  // frame image and the header frame overlay image respectively which should be
+  // used for tabbed browser windows. |frame_overlay_image_id| is set to 0 if no
+  // overlay image should be used.
+  void GetFrameImageIdsForTabbedBrowser(int* frame_image_id,
+                                        int* frame_overlay_image_id) const;
 
-  // Returns the id of the header frame overlay image based on the activation
-  // state and incognito mode.
-  // Returns 0 if no overlay image should be used.
-  int GetThemeFrameOverlayImageId() const;
+
+  // Returns the id of the header frame image which should be used for browser
+  // popups. Browser popups are not themed and do not use a frame overlay image.
+  int GetFrameImageIdForBrowserPopup() const;
+
+  // Returns the id of the header frame image which should be used for hosted
+  // apps. Hosted apps are not themed and do not use a frame overlay image.
+  int GetFrameImageIdForHostedApp() const;
 
   // View which contains the window controls.
   ash::FrameCaptionButtonContainerView* caption_button_container_;
 
   // For popups, the window icon.
   TabIconView* window_icon_;
 
   // Helper class for painting the header.
   scoped_ptr<ash::HeaderPainter> header_painter_;
 
   // Updates the hittest bounds overrides based on the window show type.
   scoped_ptr<ash::FrameBorderHitTestController>
       frame_border_hit_test_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_