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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h

Issue 9583032: Aura: Fix gray line at top of toolbar with translucent frames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak popup appearance Created 8 years, 9 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
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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 void SetButtonImages(views::ImageButton* button, 59 void SetButtonImages(views::ImageButton* button,
60 int normal_bitmap_id, 60 int normal_bitmap_id,
61 int hot_bitmap_id, 61 int hot_bitmap_id,
62 int pushed_bitmap_id); 62 int pushed_bitmap_id);
63 63
64 // Distance between top of window and client area. 64 // Distance between top of window and client area.
65 int NonClientTopBorderHeight(bool restored) const; 65 int NonClientTopBorderHeight(bool restored) const;
66 66
67 void PaintHeader(gfx::Canvas* canvas); 67 void PaintHeader(gfx::Canvas* canvas);
68 void PaintTitleBar(gfx::Canvas* canvas); 68 void PaintTitleBar(gfx::Canvas* canvas);
69 void PaintToolbarBackground(gfx::Canvas* canvas);
69 70
70 // Returns the correct bitmap for the frame header based on activation state 71 // Returns the correct bitmap for the frame header based on activation state
71 // and incognito mode. 72 // and incognito mode.
72 SkBitmap* GetThemeFrameBitmap() const; 73 SkBitmap* GetThemeFrameBitmap() const;
73 SkBitmap* GetThemeFrameOverlayBitmap() const; 74 SkBitmap* GetThemeFrameOverlayBitmap() const;
74 75
75 // Returns the theme image bitmap for |bitmap_id| if the user has a custom 76 // Returns the theme image bitmap for |bitmap_id| if the user has a custom
76 // theme image, or the bitmap for |fallback_bitmap_id| if not. 77 // theme image, or the bitmap for |fallback_bitmap_id| if not.
77 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const; 78 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const;
78 79
79 // Window controls. 80 // Window controls.
80 views::ImageButton* maximize_button_; 81 views::ImageButton* maximize_button_;
81 views::ImageButton* close_button_; 82 views::ImageButton* close_button_;
82 83
83 // For popups, the window icon. 84 // For popups, the window icon.
84 TabIconView* window_icon_; 85 TabIconView* window_icon_;
85 86
86 // Window frame header/caption parts. 87 // Window frame header/caption parts.
87 SkBitmap* button_separator_; 88 SkBitmap* button_separator_;
88 SkBitmap* top_left_corner_; 89 SkBitmap* top_left_corner_;
89 SkBitmap* top_edge_; 90 SkBitmap* top_edge_;
90 SkBitmap* top_right_corner_; 91 SkBitmap* top_right_corner_;
91 SkBitmap* header_left_edge_; 92 SkBitmap* header_left_edge_;
92 SkBitmap* header_right_edge_; 93 SkBitmap* header_right_edge_;
93 94
94 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura); 95 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
95 }; 96 };
96 97
97 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ 98 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698