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

Side by Side Diff: chrome/browser/ui/views/frame/glass_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
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_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_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/prefs/pref_member.h" 10 #include "chrome/browser/prefs/pref_member.h"
(...skipping 17 matching lines...) Expand all
28 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); 28 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
29 virtual ~GlassBrowserFrameView(); 29 virtual ~GlassBrowserFrameView();
30 30
31 // Overridden from BrowserNonClientFrameView: 31 // Overridden from BrowserNonClientFrameView:
32 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 32 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
33 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE; 33 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE;
34 virtual void UpdateThrobber(bool running) OVERRIDE; 34 virtual void UpdateThrobber(bool running) OVERRIDE;
35 35
36 // Overridden from views::NonClientFrameView: 36 // Overridden from views::NonClientFrameView:
37 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 37 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
38 virtual bool AlwaysUseNativeFrame() const OVERRIDE;
39 virtual gfx::Rect GetWindowBoundsForClientBounds( 38 virtual gfx::Rect GetWindowBoundsForClientBounds(
40 const gfx::Rect& client_bounds) const OVERRIDE; 39 const gfx::Rect& client_bounds) const OVERRIDE;
41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 40 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
42 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 41 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
43 OVERRIDE { } 42 OVERRIDE { }
44 virtual void EnableClose(bool enable) OVERRIDE { } 43 virtual void EnableClose(bool enable) OVERRIDE { }
45 virtual void ResetWindowControls() OVERRIDE { } 44 virtual void ResetWindowControls() OVERRIDE { }
46 virtual void UpdateWindowIcon() OVERRIDE { } 45 virtual void UpdateWindowIcon() OVERRIDE { }
47 46
48 // views::ViewMenuDelegate implementation: 47 // views::ViewMenuDelegate implementation:
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 StringPrefMember username_pref_; 131 StringPrefMember username_pref_;
133 132
134 static const int kThrobberIconCount = 24; 133 static const int kThrobberIconCount = 24;
135 static HICON throbber_icons_[kThrobberIconCount]; 134 static HICON throbber_icons_[kThrobberIconCount];
136 static void InitThrobberIcons(); 135 static void InitThrobberIcons();
137 136
138 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView); 137 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
139 }; 138 };
140 139
141 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 140 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698