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

Side by Side Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

Issue 10883069: Added restore functionality for maximize full/left/right (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/search/search_types.h" 10 #include "chrome/browser/ui/search/search_types.h"
11 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h" 11 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
13 #include "chrome/browser/ui/views/tab_icon_view_model.h" 13 #include "chrome/browser/ui/views/tab_icon_view_model.h"
14 #include "ui/views/controls/button/button.h" // ButtonListener 14 #include "ui/views/controls/button/button.h" // ButtonListener
15 15
16 class TabIconView; 16 class TabIconView;
17 17
18 namespace ash { 18 namespace ash {
19 class FramePainter; 19 class FramePainter;
20 class FrameMaximizeButton;
20 } 21 }
21 namespace views { 22 namespace views {
22 class ImageButton; 23 class ImageButton;
23 } 24 }
24 25
25 class BrowserNonClientFrameViewAsh 26 class BrowserNonClientFrameViewAsh
26 : public BrowserNonClientFrameView, 27 : public BrowserNonClientFrameView,
27 public views::ButtonListener, 28 public views::ButtonListener,
28 public chrome::TabIconViewModel, 29 public chrome::TabIconViewModel,
29 public chrome::search::ToolbarSearchAnimatorObserver { 30 public chrome::search::ToolbarSearchAnimatorObserver {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 96
96 // Returns the correct image id for the frame header based on activation 97 // Returns the correct image id for the frame header based on activation
97 // state and incognito mode. 98 // state and incognito mode.
98 int GetThemeFrameImageId() const; 99 int GetThemeFrameImageId() const;
99 const gfx::ImageSkia* GetThemeFrameOverlayImage() const; 100 const gfx::ImageSkia* GetThemeFrameOverlayImage() const;
100 101
101 // Window controls. The |size_button_| either toggles maximized or toggles 102 // Window controls. The |size_button_| either toggles maximized or toggles
102 // minimized. The exact behavior is determined by |size_button_minimizes_|. 103 // minimized. The exact behavior is determined by |size_button_minimizes_|.
103 views::ImageButton* size_button_; 104 views::ImageButton* size_button_;
104 views::ImageButton* close_button_; 105 views::ImageButton* close_button_;
106 // If NULL the |size_button_| minimizes, otherwise this button should be
107 // used for state toggling.
108 ash::FrameMaximizeButton* maximize_button_;
105 109
106 // For popups, the window icon. 110 // For popups, the window icon.
107 TabIconView* window_icon_; 111 TabIconView* window_icon_;
108 112
109 // Painter for the frame header. 113 // Painter for the frame header.
110 scoped_ptr<ash::FramePainter> frame_painter_; 114 scoped_ptr<ash::FramePainter> frame_painter_;
111 115
112 // If true the |size_button_| minimizes, otherwise it toggles between
113 // maximized and restored.
114 bool size_button_minimizes_;
115
116 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 116 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
117 }; 117 };
118 118
119 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 119 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698