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

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: review feedback 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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) 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
11 namespace aura { 11 namespace aura {
12 class Window; 12 class Window;
13 } 13 }
14 14
15 // NonClientFrameViewAura implementation for apps. 15 // NonClientFrameViewAura implementation for apps.
16 class AppNonClientFrameViewAura : public BrowserNonClientFrameView { 16 class AppNonClientFrameViewAura : public BrowserNonClientFrameView {
17 public: 17 public:
18 static const char kControlWindowName[]; // visible for test
19
18 AppNonClientFrameViewAura( 20 AppNonClientFrameViewAura(
19 BrowserFrame* frame, BrowserView* browser_view); 21 BrowserFrame* frame, BrowserView* browser_view);
20 virtual ~AppNonClientFrameViewAura(); 22 virtual ~AppNonClientFrameViewAura();
21 23
22 // NonClientFrameView: 24 // NonClientFrameView:
23 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 25 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
24 virtual gfx::Rect GetWindowBoundsForClientBounds( 26 virtual gfx::Rect GetWindowBoundsForClientBounds(
25 const gfx::Rect& client_bounds) const OVERRIDE; 27 const gfx::Rect& client_bounds) const OVERRIDE;
26 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 28 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
27 virtual void GetWindowMask( 29 virtual void GetWindowMask(
(...skipping 25 matching lines...) Expand all
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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698