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

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

Issue 9835013: Ash: Don't show window icon or title for app windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to BrowserView, add line 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 private: 61 private:
62 // Distance between top of window and client area. 62 // Distance between top of window and client area.
63 int NonClientTopBorderHeight(bool force_restored) const; 63 int NonClientTopBorderHeight(bool force_restored) const;
64 64
65 // Layout the incognito icon. 65 // Layout the incognito icon.
66 void LayoutAvatar(); 66 void LayoutAvatar();
67 67
68 void PaintTitleBar(gfx::Canvas* canvas); 68 void PaintTitleBar(gfx::Canvas* canvas);
69 void PaintToolbarBackground(gfx::Canvas* canvas); 69 void PaintToolbarBackground(gfx::Canvas* canvas);
70 70
71 // Windows without a toolbar need to draw their own line under the header,
72 // above the content area.
73 void PaintContentEdge(gfx::Canvas* canvas);
74
71 // Returns the correct bitmap for the frame header based on activation state 75 // Returns the correct bitmap for the frame header based on activation state
72 // and incognito mode. 76 // and incognito mode.
73 const SkBitmap* GetThemeFrameBitmap() const; 77 const SkBitmap* GetThemeFrameBitmap() const;
74 const SkBitmap* GetThemeFrameOverlayBitmap() const; 78 const SkBitmap* GetThemeFrameOverlayBitmap() const;
75 79
76 // Returns the theme image bitmap for |bitmap_id| if the user has a custom 80 // Returns the theme image bitmap for |bitmap_id| if the user has a custom
77 // theme image, or the bitmap for |fallback_bitmap_id| if not. 81 // theme image, or the bitmap for |fallback_bitmap_id| if not.
78 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const; 82 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const;
79 83
80 // Window controls. 84 // Window controls.
81 views::ImageButton* maximize_button_; 85 views::ImageButton* maximize_button_;
82 views::ImageButton* close_button_; 86 views::ImageButton* close_button_;
83 87
84 // For popups, the window icon. 88 // For popups, the window icon.
85 TabIconView* window_icon_; 89 TabIconView* window_icon_;
86 90
87 // Painter for the frame header. 91 // Painter for the frame header.
88 scoped_ptr<ash::FramePainter> frame_painter_; 92 scoped_ptr<ash::FramePainter> frame_painter_;
89 93
90 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura); 94 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
91 }; 95 };
92 96
93 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ 97 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698