diff options
Diffstat (limited to 'chrome/views')
22 files changed, 23 insertions, 45 deletions
diff --git a/chrome/views/border.h b/chrome/views/border.h index ae6831c..c53a92d 100644 --- a/chrome/views/border.h +++ b/chrome/views/border.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_BORDER_H_ #define CHROME_VIEWS_BORDER_H_ -#include "chrome/common/gfx/insets.h" +#include "app/gfx/insets.h" #include "chrome/views/view.h" #include "SkColor.h" diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc index f7e7136..6f82b16 100644 --- a/chrome/views/controls/button/menu_button.cc +++ b/chrome/views/controls/button/menu_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/menu_button.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/menu/view_menu_delegate.h" diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc index 7cd8920..be9918f 100644 --- a/chrome/views/controls/label.cc +++ b/chrome/views/controls/label.cc @@ -8,11 +8,11 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/insets.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/views/background.h" diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc index c591a7e..1b1e475 100644 --- a/chrome/views/controls/menu/chrome_menu.cc +++ b/chrome/views/controls/menu/chrome_menu.cc @@ -11,6 +11,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" +#include "app/os_exchange_data.h" #include "base/base_drag_source.h" #include "base/gfx/native_theme.h" #include "base/message_loop.h" @@ -20,7 +21,6 @@ // TODO(beng): (Cleanup) remove this browser dep. #include "chrome/browser/drag_utils.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/views/border.h" #include "chrome/views/view_constants.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/controls/menu/chrome_menu.h b/chrome/views/controls/menu/chrome_menu.h index 5258742..6f18abb 100644 --- a/chrome/views/controls/menu/chrome_menu.h +++ b/chrome/views/controls/menu/chrome_menu.h @@ -8,12 +8,12 @@ #include <list> #include <vector> +#include "app/drag_drop_types.h" #include "app/gfx/chrome_font.h" #include "base/gfx/point.h" #include "base/gfx/rect.h" #include "base/message_loop.h" #include "base/task.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/views/controls/menu/controller.h" #include "chrome/views/view.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc index 191b78c..6fb895a 100644 --- a/chrome/views/controls/message_box_view.cc +++ b/chrome/views/controls/message_box_view.cc @@ -5,13 +5,13 @@ #include "chrome/views/controls/message_box_view.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/clipboard.h" #include "base/message_loop.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/window/client_view.h" #include "grit/generated_resources.h" diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc index ecb9773..445c262 100644 --- a/chrome/views/controls/table/table_view.cc +++ b/chrome/views/controls/table/table_view.cc @@ -8,12 +8,12 @@ #include <windowsx.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/favicon_size.h" +#include "app/gfx/icon_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/win_util.h" -#include "chrome/common/gfx/favicon_size.h" -#include "chrome/common/gfx/icon_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" #include "SkBitmap.h" diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc index 4e61afd..0871cdf 100644 --- a/chrome/views/controls/text_field.cc +++ b/chrome/views/controls/text_field.cc @@ -11,6 +11,7 @@ #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl #include <vsstyle.h> +#include "app/gfx/insets.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/clipboard.h" @@ -19,8 +20,6 @@ #include "base/string_util.h" #include "base/win_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/gfx/insets.h" -#include "chrome/common/logging_chrome.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" #include "chrome/views/controls/menu/menu.h" diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc index de2a651..64d18e5 100644 --- a/chrome/views/controls/throbber.cc +++ b/chrome/views/controls/throbber.cc @@ -7,7 +7,6 @@ #include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/time.h" -#include "chrome/common/logging_chrome.h" #include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc index e657658..1bf668c 100644 --- a/chrome/views/controls/tree/tree_view.cc +++ b/chrome/views/controls/tree/tree_view.cc @@ -7,12 +7,12 @@ #include <shellapi.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/icon_util.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/win_util.h" -#include "chrome/common/gfx/icon_util.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" diff --git a/chrome/views/event.cc b/chrome/views/event.cc index d0b375c..a968adc 100644 --- a/chrome/views/event.cc +++ b/chrome/views/event.cc @@ -5,9 +5,6 @@ #include "chrome/views/event.h" #include "chrome/views/view.h" -#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" - -using WebKit::WebInputEvent; namespace views { @@ -21,18 +18,6 @@ Event::Event(EventType type, int flags) flags_(flags) { } -// static -int Event::ConvertWebInputEventFlags(int web_input_event_flags) { - int r = 0; - if (web_input_event_flags & WebInputEvent::ShiftKey) - r |= EF_SHIFT_DOWN; - if (web_input_event_flags & WebInputEvent::ControlKey) - r |= EF_CONTROL_DOWN; - if (web_input_event_flags & WebInputEvent::AltKey) - r |= EF_ALT_DOWN; - return r; -} - LocatedEvent::LocatedEvent(const LocatedEvent& model, View* from, View* to) : Event(model), location_(model.location_) { diff --git a/chrome/views/event.h b/chrome/views/event.h index 3171ad4..d3dbb61 100644 --- a/chrome/views/event.h +++ b/chrome/views/event.h @@ -12,7 +12,6 @@ #endif #include "base/gfx/point.h" -#include "webkit/glue/window_open_disposition.h" class OSExchangeData; @@ -100,10 +99,6 @@ class Event { static int GetFlagsFromGdkState(int state); #endif - // Convert WebInputEvent::Modifiers flags to views::Event flags. - // Note that this only deals with keyboard modifiers. - static int ConvertWebInputEventFlags(int web_input_event_flags); - protected: Event(EventType type, int flags); diff --git a/chrome/views/view.cc b/chrome/views/view.cc index 22ab762..8c2a888 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -9,13 +9,13 @@ #include <iostream> #endif +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" #include "base/string_util.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/views/background.h" #include "chrome/views/layout_manager.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc index ad14e81..da8c6ff 100644 --- a/chrome/views/view_unittest.cc +++ b/chrome/views/view_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" #include "base/clipboard.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/checkbox.h" diff --git a/chrome/views/view_win.cc b/chrome/views/view_win.cc index 41e97a9..382e169 100644 --- a/chrome/views/view_win.cc +++ b/chrome/views/view_win.cc @@ -4,12 +4,12 @@ #include "chrome/views/view.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" +#include "app/os_exchange_data.h" #include "base/scoped_handle.h" #include "base/string_util.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/path.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/views/accessibility/view_accessibility_wrapper.h" #include "chrome/views/border.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/widget/root_view.cc b/chrome/views/widget/root_view.cc index 8d7b047..bd57fe4 100644 --- a/chrome/views/widget/root_view.cc +++ b/chrome/views/widget/root_view.cc @@ -6,13 +6,13 @@ #include <algorithm> +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #if defined(OS_WIN) #include "base/base_drag_source.h" #endif #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/common/notification_service.h" #if defined(OS_WIN) #include "chrome/views/widget/root_view_drop_target.h" diff --git a/chrome/views/widget/root_view_drop_target.cc b/chrome/views/widget/root_view_drop_target.cc index 60324c5..832caac 100644 --- a/chrome/views/widget/root_view_drop_target.cc +++ b/chrome/views/widget/root_view_drop_target.cc @@ -4,8 +4,8 @@ #include "chrome/views/widget/root_view_drop_target.h" +#include "app/drag_drop_types.h" #include "base/gfx/point.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/widget/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h index 02ce6c6..3e3aec1 100644 --- a/chrome/views/widget/root_view_drop_target.h +++ b/chrome/views/widget/root_view_drop_target.h @@ -9,8 +9,8 @@ #include <atlapp.h> #include <atlmisc.h> +#include "app/os_exchange_data.h" #include "base/base_drop_target.h" -#include "chrome/common/os_exchange_data.h" namespace gfx { class Point; diff --git a/chrome/views/widget/root_view_win.cc b/chrome/views/widget/root_view_win.cc index 17efd54..14bd9c5 100644 --- a/chrome/views/widget/root_view_win.cc +++ b/chrome/views/widget/root_view_win.cc @@ -4,10 +4,10 @@ #include "chrome/views/widget/root_view.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "base/base_drag_source.h" #include "base/logging.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/views/widget/root_view_drop_target.h" namespace views { diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc index d5d587e..4c824af 100644 --- a/chrome/views/window/custom_frame_view.cc +++ b/chrome/views/window/custom_frame_view.cc @@ -6,9 +6,9 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/path.h" #include "app/resource_bundle.h" #include "base/win_util.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_delegate.h" diff --git a/chrome/views/window/dialog_delegate.h b/chrome/views/window/dialog_delegate.h index 8add450..a38100c 100644 --- a/chrome/views/window/dialog_delegate.h +++ b/chrome/views/window/dialog_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_ #define CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_ -#include "chrome/common/message_box_flags.h" +#include "app/message_box_flags.h" #include "chrome/views/window/dialog_client_view.h" #include "chrome/views/window/window_delegate.h" diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 58301f5..0093b3a 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -8,12 +8,12 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/icon_util.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/icon_util.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" |