chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h - Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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

OLD	NEW
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_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_

7 #pragma once	7 #pragma once

8	8

	9 #include "ui/aura_shell/window_frame.h"

9 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"	11 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"

11 #include "ui/aura_shell/window_frame.h"

12 #include "ui/views/widget/widget.h"

13 #include "views/controls/button/button.h"	12 #include "views/controls/button/button.h"

	13 #include "views/widget/widget.h"

14	14

15 class BrowserFrame;	15 class BrowserFrame;

16 class BrowserView;	16 class BrowserView;

17 class FrameBackground;	17 class FrameBackground;

18 class WindowControlButton;	18 class WindowControlButton;

19	19

20 class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,	20 class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,

21 public views::ButtonListener,	21 public views::ButtonListener,

22 public views::Widget::Observer,	22 public views::Widget::Observer,

23 public aura_shell::WindowFrame {	23 public aura_shell::WindowFrame {

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83	83

84 int last_hittest_code_;	84 int last_hittest_code_;

85 WindowControlButton* maximize_button_;	85 WindowControlButton* maximize_button_;

86 WindowControlButton* close_button_;	86 WindowControlButton* close_button_;

87 FrameBackground* frame_background_;	87 FrameBackground* frame_background_;

88	88

89 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);	89 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);

90 };	90 };

91	91

92 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	92 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_

OLD	NEW