Use white header for app windows part #2

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
index 944944cb55e3b19f5065e374bdcce864614e13ba..49925d21e912665421a4e97fa19f63d8f0d8593f 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
@@ -104,14 +104,21 @@ class BrowserNonClientFrameViewAsh
   // 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;
-
-  // 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;
+  // 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 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_;