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

Unified Diff: chrome/browser/ui/views/options/advanced_page_view.cc

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
Index: chrome/browser/ui/views/options/advanced_page_view.cc
===================================================================
--- chrome/browser/ui/views/options/advanced_page_view.cc (revision 71854)
+++ chrome/browser/ui/views/options/advanced_page_view.cc (working copy)
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/options/advanced_page_view.h"
#include "app/l10n_util.h"
-#include "app/message_box_flags.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
@@ -16,6 +15,7 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
+#include "ui/base/message_box_flags.h"
#include "views/controls/message_box_view.h"
#include "views/controls/button/native_button.h"
#include "views/controls/scroll_view.h"
@@ -38,12 +38,12 @@
protected:
// views::DialogDelegate
virtual std::wstring GetDialogButtonLabel(
- MessageBoxFlags::DialogButton button) const {
+ ui::MessageBoxFlags::DialogButton button) const {
switch (button) {
- case MessageBoxFlags::DIALOGBUTTON_OK:
+ case ui::MessageBoxFlags::DIALOGBUTTON_OK:
return UTF16ToWide(
l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_OKLABEL));
- case MessageBoxFlags::DIALOGBUTTON_CANCEL:
+ case ui::MessageBoxFlags::DIALOGBUTTON_CANCEL:
return UTF16ToWide(
l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_CANCELLABEL));
default:
@@ -71,7 +71,8 @@
IDS_OPTIONS_RESET_CONFIRM_BOX_WIDTH_CHARS);
// Also deleted when the window closes.
message_box_view_ = new MessageBoxView(
- MessageBoxFlags::kFlagHasMessage | MessageBoxFlags::kFlagHasOKButton,
+ ui::MessageBoxFlags::kFlagHasMessage |
+ ui::MessageBoxFlags::kFlagHasOKButton,
UTF16ToWide(
l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_MESSAGE)).c_str(),
std::wstring(),
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/options/passwords_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698