ash/display/display_error_dialog.h - Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc.

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: ash/display/display_error_dialog.h

Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reorder DialogDelegate functions; inline Get*Params into WidgetExample::ButtonPressed; etc. Created 8 years 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 | « ash/ash.gyp ('k') | ash/display/display_error_dialog.cc » ('j') | no next file with comments »

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

6 #define ASH_DISPLAY_DISPLAY_ERROR_DIALOG_H_	6 #define ASH_DISPLAY_DISPLAY_ERROR_DIALOG_H_

7	7

8 #include "ash/display/display_controller.h"	8 #include "ash/display/display_controller.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "ui/views/window/dialog_delegate.h"	10 #include "ui/views/window/dialog_delegate.h"

(...skipping 24 matching lines...) Expand all Loading...
35	35

36 private:	36 private:

37 DisplayErrorDialog();	37 DisplayErrorDialog();

38 virtual ~DisplayErrorDialog();	38 virtual ~DisplayErrorDialog();

39	39

40 // views::DialogDelegate overrides:	40 // views::DialogDelegate overrides:

41 virtual int GetDialogButtons() const OVERRIDE;	41 virtual int GetDialogButtons() const OVERRIDE;

42	42

43 // views::WidgetDelegate overrides::	43 // views::WidgetDelegate overrides::

44 virtual ui::ModalType GetModalType() const OVERRIDE;	44 virtual ui::ModalType GetModalType() const OVERRIDE;

45 virtual views::View* GetContentsView() OVERRIDE;

46	45

47 // views::View overrides:	46 // views::View overrides:

48 virtual gfx::Size GetPreferredSize() OVERRIDE;	47 virtual gfx::Size GetPreferredSize() OVERRIDE;

49	48

50 // ash::DisplayController::Observer overrides:	49 // ash::DisplayController::Observer overrides:

51 virtual void OnDisplayConfigurationChanging() OVERRIDE;	50 virtual void OnDisplayConfigurationChanging() OVERRIDE;

52	51

53 views::Label* label_;	52 views::Label* label_;

54	53

55 DISALLOW_COPY_AND_ASSIGN(DisplayErrorDialog);	54 DISALLOW_COPY_AND_ASSIGN(DisplayErrorDialog);

56 };	55 };

57	56

58 } // namespace internal	57 } // namespace internal

59 } // namespace ash	58 } // namespace ash

60	59

61 #endif // ASH_DISPLAY_DISPLAY_ERROR_DIALOG_H_	60 #endif // ASH_DISPLAY_DISPLAY_ERROR_DIALOG_H_

OLD	NEW