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

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

Issue 10961027: cros: Fix crash in AppNonClientFrameViewAura::ControlView::ButtonPressed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test 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_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
10 10
(...skipping 22 matching lines...) Expand all
33 // BrowserNonClientFrameView: 33 // BrowserNonClientFrameView:
34 virtual gfx::Rect GetBoundsForTabStrip( 34 virtual gfx::Rect GetBoundsForTabStrip(
35 views::View* tabstrip) const OVERRIDE; 35 views::View* tabstrip) const OVERRIDE;
36 virtual TabStripInsets GetTabStripInsets(bool restored) const OVERRIDE; 36 virtual TabStripInsets GetTabStripInsets(bool restored) const OVERRIDE;
37 virtual int GetThemeBackgroundXInset() const OVERRIDE; 37 virtual int GetThemeBackgroundXInset() const OVERRIDE;
38 virtual void UpdateThrobber(bool running) OVERRIDE; 38 virtual void UpdateThrobber(bool running) OVERRIDE;
39 39
40 // View: 40 // View:
41 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 41 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
42 42
43 static const char kControlWindowName[]; // visible for test
sky 2012/09/20 20:02:15 constants should be first in a section.
James Cook 2012/09/20 20:06:54 Done.
44
43 private: 45 private:
44 class ControlView; 46 class ControlView;
45 class FrameObserver; 47 class FrameObserver;
46 48
47 gfx::Rect GetControlBounds() const; 49 gfx::Rect GetControlBounds() const;
48 50
49 // Closes |control_widget_|. 51 // Closes |control_widget_|.
50 void CloseControlWidget(); 52 void CloseControlWidget();
51 53
52 // The View containing the restore and close buttons. 54 // The View containing the restore and close buttons.
53 ControlView* control_view_; 55 ControlView* control_view_;
54 // The widget holding the control_view_. 56 // The widget holding the control_view_.
55 views::Widget* control_widget_; 57 views::Widget* control_widget_;
56 // Observer for browser frame close. 58 // Observer for browser frame close.
57 scoped_ptr<FrameObserver> frame_observer_; 59 scoped_ptr<FrameObserver> frame_observer_;
58 60
59 DISALLOW_COPY_AND_ASSIGN(AppNonClientFrameViewAura); 61 DISALLOW_COPY_AND_ASSIGN(AppNonClientFrameViewAura);
60 }; 62 };
61 63
62 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_ 64 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698