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

Side by Side Diff: ash/display/display_error_dialog.cc

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/display/display_error_dialog.h ('k') | ash/shell.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 #include "ash/display/display_error_dialog.h" 5 #include "ash/display/display_error_dialog.h"
6 6
7 #include "ash/screen_ash.h" 7 #include "ash/screen_ash.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "grit/ash_strings.h" 9 #include "grit/ash_strings.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 int DisplayErrorDialog::GetDialogButtons() const { 80 int DisplayErrorDialog::GetDialogButtons() const {
81 return ui::DIALOG_BUTTON_OK; 81 return ui::DIALOG_BUTTON_OK;
82 } 82 }
83 83
84 ui::ModalType DisplayErrorDialog::GetModalType() const { 84 ui::ModalType DisplayErrorDialog::GetModalType() const {
85 return ui::MODAL_TYPE_NONE; 85 return ui::MODAL_TYPE_NONE;
86 } 86 }
87 87
88 views::View* DisplayErrorDialog::GetContentsView() {
89 return this;
90 }
91
92 gfx::Size DisplayErrorDialog::GetPreferredSize() { 88 gfx::Size DisplayErrorDialog::GetPreferredSize() {
93 return label_->GetPreferredSize(); 89 return label_->GetPreferredSize();
94 } 90 }
95 91
96 void DisplayErrorDialog::OnDisplayConfigurationChanging() { 92 void DisplayErrorDialog::OnDisplayConfigurationChanging() {
97 GetWidget()->Close(); 93 GetWidget()->Close();
98 } 94 }
99 95
100 } // namespace internal 96 } // namespace internal
101 } // namespace ash 97 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_dialog.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698