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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.h

Issue 7036014: Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 void OnActivationChanged(bool active); 35 void OnActivationChanged(bool active);
36 36
37 protected: 37 protected:
38 // Overridden from BrowserNonClientFrameView: 38 // Overridden from BrowserNonClientFrameView:
39 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 39 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
40 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE; 40 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE;
41 virtual void UpdateThrobber(bool running) OVERRIDE; 41 virtual void UpdateThrobber(bool running) OVERRIDE;
42 42
43 // Overridden from views::NonClientFrameView: 43 // Overridden from views::NonClientFrameView:
44 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 44 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
45 virtual bool AlwaysUseCustomFrame() const OVERRIDE;
46 virtual bool AlwaysUseNativeFrame() const OVERRIDE;
47 virtual gfx::Rect GetWindowBoundsForClientBounds( 45 virtual gfx::Rect GetWindowBoundsForClientBounds(
48 const gfx::Rect& client_bounds) const OVERRIDE; 46 const gfx::Rect& client_bounds) const OVERRIDE;
49 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 47 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
50 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 48 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
51 OVERRIDE; 49 OVERRIDE;
52 virtual void EnableClose(bool enable) OVERRIDE; 50 virtual void EnableClose(bool enable) OVERRIDE;
53 virtual void ResetWindowControls() OVERRIDE; 51 virtual void ResetWindowControls() OVERRIDE;
54 virtual void UpdateWindowIcon() OVERRIDE; 52 virtual void UpdateWindowIcon() OVERRIDE;
55 53
56 // Overridden from views::View: 54 // Overridden from views::View:
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 views::Label* title_label_; 134 views::Label* title_label_;
137 gfx::Rect client_view_bounds_; 135 gfx::Rect client_view_bounds_;
138 std::wstring accessible_name_; 136 std::wstring accessible_name_;
139 scoped_ptr<views::Menu2> options_menu_; 137 scoped_ptr<views::Menu2> options_menu_;
140 scoped_ptr<ui::SimpleMenuModel> options_menu_contents_; 138 scoped_ptr<ui::SimpleMenuModel> options_menu_contents_;
141 139
142 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView); 140 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
143 }; 141 };
144 142
145 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 143 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698