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

Unified Diff: views/window/dialog_delegate.h

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/widget_gtk.h ('k') | views/window/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/dialog_delegate.h
===================================================================
--- views/window/dialog_delegate.h (revision 71854)
+++ views/window/dialog_delegate.h (working copy)
@@ -6,7 +6,7 @@
#define VIEWS_WINDOW_DIALOG_DELEGATE_H_
#pragma once
-#include "app/message_box_flags.h"
+#include "ui/base/message_box_flags.h"
#include "views/accessibility/accessibility_types.h"
#include "views/window/dialog_client_view.h"
#include "views/window/window_delegate.h"
@@ -37,22 +37,24 @@
//
// To use the extra button you need to override GetDialogButtons()
virtual int GetDialogButtons() const {
- return MessageBoxFlags::DIALOGBUTTON_OK |
- MessageBoxFlags::DIALOGBUTTON_CANCEL;
+ return ui::MessageBoxFlags::DIALOGBUTTON_OK |
+ ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
}
// Returns whether accelerators are enabled on the button. This is invoked
// when an accelerator is pressed, not at construction time. This
// returns true.
- virtual bool AreAcceleratorsEnabled(MessageBoxFlags::DialogButton button) {
+ virtual bool AreAcceleratorsEnabled(
+ ui::MessageBoxFlags::DialogButton button) {
return true;
}
// Returns the label of the specified DialogButton.
virtual std::wstring GetDialogButtonLabel(
- MessageBoxFlags::DialogButton button) const {
- // empty string results in defaults for MessageBoxFlags::DIALOGBUTTON_OK,
- // MessageBoxFlags::DIALOGBUTTON_CANCEL.
+ ui::MessageBoxFlags::DialogButton button) const {
+ // empty string results in defaults for
+ // ui::MessageBoxFlags::DIALOGBUTTON_OK,
+ // ui::MessageBoxFlags::DIALOGBUTTON_CANCEL.
return L"";
}
@@ -69,21 +71,21 @@
// Returns the default dialog button. This should not be a mask as only
// one button should ever be the default button. Return
- // MessageBoxFlags::DIALOGBUTTON_NONE if there is no default. Default
- // behavior is to return MessageBoxFlags::DIALOGBUTTON_OK or
- // MessageBoxFlags::DIALOGBUTTON_CANCEL (in that order) if they are
- // present, MessageBoxFlags::DIALOGBUTTON_NONE otherwise.
+ // ui::MessageBoxFlags::DIALOGBUTTON_NONE if there is no default. Default
+ // behavior is to return ui::MessageBoxFlags::DIALOGBUTTON_OK or
+ // ui::MessageBoxFlags::DIALOGBUTTON_CANCEL (in that order) if they are
+ // present, ui::MessageBoxFlags::DIALOGBUTTON_NONE otherwise.
virtual int GetDefaultDialogButton() const;
// Returns whether the specified dialog button is enabled.
virtual bool IsDialogButtonEnabled(
- MessageBoxFlags::DialogButton button) const {
+ ui::MessageBoxFlags::DialogButton button) const {
return true;
}
// Returns whether the specified dialog button is visible.
virtual bool IsDialogButtonVisible(
- MessageBoxFlags::DialogButton button) const {
+ ui::MessageBoxFlags::DialogButton button) const {
return true;
}
« no previous file with comments | « views/widget/widget_gtk.h ('k') | views/window/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698