summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/button/native_button_gtk.h2
-rw-r--r--views/controls/combobox/native_combobox_gtk.h2
-rw-r--r--views/controls/label.cc6
-rw-r--r--views/controls/menu/native_menu_gtk.h2
-rw-r--r--views/controls/message_box_view.cc6
-rw-r--r--views/controls/native_control.cc4
-rw-r--r--views/controls/native_control_win.cc4
-rw-r--r--views/controls/native_control_win.h4
-rw-r--r--views/controls/table/native_table_gtk.h2
9 files changed, 16 insertions, 16 deletions
diff --git a/views/controls/button/native_button_gtk.h b/views/controls/button/native_button_gtk.h
index 2ae38b1..8e0d5bf 100644
--- a/views/controls/button/native_button_gtk.h
+++ b/views/controls/button/native_button_gtk.h
@@ -6,7 +6,7 @@
#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_GTK_H_
#pragma once
-#include "app/gtk_signal.h"
+#include "ui/base/gtk/gtk_signal.h"
#include "views/controls/button/native_button_wrapper.h"
#include "views/controls/native_control_gtk.h"
diff --git a/views/controls/combobox/native_combobox_gtk.h b/views/controls/combobox/native_combobox_gtk.h
index 56e8666..7d5f30a 100644
--- a/views/controls/combobox/native_combobox_gtk.h
+++ b/views/controls/combobox/native_combobox_gtk.h
@@ -6,7 +6,7 @@
#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
#pragma once
-#include "app/gtk_signal.h"
+#include "ui/base/gtk/gtk_signal.h"
#include "views/controls/combobox/native_combobox_wrapper.h"
#include "views/controls/native_control_gtk.h"
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 62a9198..c54d6dd 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -8,7 +8,6 @@
#include <limits>
#include "app/resource_bundle.h"
-#include "app/text_elider.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/string_split.h"
@@ -18,6 +17,7 @@
#include "gfx/color_utils.h"
#include "gfx/font.h"
#include "gfx/insets.h"
+#include "ui/base/text/text_elider.h"
#include "views/background.h"
namespace views {
@@ -428,7 +428,7 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text,
// TODO(jungshik) : Figure out how to get 'intl.accept_languages'
// preference and use it when calling ElideUrl.
*paint_text = UTF16ToWideHack(
- gfx::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
+ ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
// An URLs is always treated as an LTR text and therefore we should
// explicitly mark it as such if the locale is RTL so that URLs containing
@@ -442,7 +442,7 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text,
*paint_text = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
WideToUTF16(*paint_text)));
} else if (elide_in_middle_) {
- *paint_text = UTF16ToWideHack(gfx::ElideText(text_,
+ *paint_text = UTF16ToWideHack(ui::ElideText(text_,
font_, GetAvailableRect().width(), true));
} else {
*paint_text = UTF16ToWideHack(text_);
diff --git a/views/controls/menu/native_menu_gtk.h b/views/controls/menu/native_menu_gtk.h
index 58a6993..c3ab15c 100644
--- a/views/controls/menu/native_menu_gtk.h
+++ b/views/controls/menu/native_menu_gtk.h
@@ -10,9 +10,9 @@
#include <vector>
-#include "app/gtk_signal.h"
#include "base/message_loop.h"
#include "base/task.h"
+#include "ui/base/gtk/gtk_signal.h"
#include "views/controls/menu/menu_wrapper.h"
namespace ui {
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 245b861..a239a16 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -4,12 +4,12 @@
#include "views/controls/message_box_view.h"
-#include "app/message_box_flags.h"
#include "base/i18n/rtl.h"
#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/base/message_box_flags.h"
#include "views/controls/button/checkbox.h"
#include "views/standard_layout.h"
#include "views/views_delegate.h"
@@ -118,7 +118,7 @@ void MessageBoxView::Init(int dialog_flags,
const std::wstring& default_prompt) {
message_label_->SetMultiLine(true);
message_label_->SetAllowCharacterBreak(true);
- if (dialog_flags & MessageBoxFlags::kAutoDetectAlignment) {
+ if (dialog_flags & ui::MessageBoxFlags::kAutoDetectAlignment) {
// Determine the alignment and directionality based on the first character
// with strong directionality.
base::i18n::TextDirection direction =
@@ -137,7 +137,7 @@ void MessageBoxView::Init(int dialog_flags,
message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
}
- if (dialog_flags & MessageBoxFlags::kFlagHasPromptField) {
+ if (dialog_flags & ui::MessageBoxFlags::kFlagHasPromptField) {
prompt_field_ = new views::Textfield;
prompt_field_->SetText(WideToUTF16Hack(default_prompt));
}
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index d1cc36d..01cbb15 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -11,12 +11,12 @@
#include <atlmisc.h>
#include "app/l10n_util_win.h"
-#include "app/view_prop.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "gfx/native_theme_win.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/view_prop.h"
#include "ui/base/win/hwnd_util.h"
#include "views/background.h"
#include "views/border.h"
@@ -24,7 +24,7 @@
#include "views/focus/focus_manager.h"
#include "views/widget/widget.h"
-using app::ViewProp;
+using ui::ViewProp;
namespace views {
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 6e805b8f..af27b4c 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -7,12 +7,12 @@
#include <windowsx.h>
#include "app/l10n_util_win.h"
-#include "app/view_prop.h"
#include "base/logging.h"
+#include "ui/base/view_prop.h"
#include "ui/base/win/hwnd_util.h"
#include "views/focus/focus_manager.h"
-using app::ViewProp;
+using ui::ViewProp;
namespace views {
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index d27efa4..289c679 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -12,7 +12,7 @@
#include "views/controls/native/native_view_host.h"
#include "views/widget/child_window_message_processor.h"
-namespace app {
+namespace ui {
class ViewProp;
}
@@ -73,7 +73,7 @@ class NativeControlWin : public ChildWindowMessageProcessor,
DWORD GetAdditionalRTLStyle() const;
private:
- typedef ScopedVector<app::ViewProp> ViewProps;
+ typedef ScopedVector<ui::ViewProp> ViewProps;
// Called by the containing WidgetWin when a message of type WM_CTLCOLORBTN or
// WM_CTLCOLORSTATIC is sent from the HWND created by an object dreived from
diff --git a/views/controls/table/native_table_gtk.h b/views/controls/table/native_table_gtk.h
index e9bf008..d7516de 100644
--- a/views/controls/table/native_table_gtk.h
+++ b/views/controls/table/native_table_gtk.h
@@ -6,8 +6,8 @@
#define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_GTK_H_
#pragma once
-#include "app/gtk_signal.h"
#include "ui/base/models/table_model.h"
+#include "ui/base/gtk/gtk_signal.h"
#include "views/controls/native_control_gtk.h"
#include "views/controls/table/native_table_wrapper.h"
generated by cgit v1.1 at 2025-01-30 21:09:10 +0000