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

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

Issue 9958039: Changes the maximize button to only minimize for panels. This resulted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Spelling Created 8 years, 8 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 // 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
76 // and incognito mode. 76 // and incognito mode.
77 const SkBitmap* GetThemeFrameBitmap() const; 77 const SkBitmap* GetThemeFrameBitmap() const;
78 const SkBitmap* GetThemeFrameOverlayBitmap() const; 78 const SkBitmap* GetThemeFrameOverlayBitmap() const;
79 79
80 // 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
81 // theme image, or the bitmap for |fallback_bitmap_id| if not. 81 // theme image, or the bitmap for |fallback_bitmap_id| if not.
82 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const; 82 SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const;
83 83
84 // Window controls. 84 // Window controls. The |size_button_| either toggles maximized or toggles
85 views::ImageButton* maximize_button_; 85 // minimized. The exact behavior is determined by |size_button_minimizes_|.
86 views::ImageButton* size_button_;
86 views::ImageButton* close_button_; 87 views::ImageButton* close_button_;
87 88
88 // For popups, the window icon. 89 // For popups, the window icon.
89 TabIconView* window_icon_; 90 TabIconView* window_icon_;
90 91
91 // Painter for the frame header. 92 // Painter for the frame header.
92 scoped_ptr<ash::FramePainter> frame_painter_; 93 scoped_ptr<ash::FramePainter> frame_painter_;
93 94
95 // If true the |size_button_| minimizes, otherwise it toggles between
96 // maximized and restored.
97 bool size_button_minimizes_;
98
94 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura); 99 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
95 }; 100 };
96 101
97 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ 102 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698