diff options
Diffstat (limited to 'chrome/browser')
22 files changed, 43 insertions, 48 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility.h b/chrome/browser/accessibility/browser_accessibility.h index e75b9cb..6f42911 100644 --- a/chrome/browser/accessibility/browser_accessibility.h +++ b/chrome/browser/accessibility/browser_accessibility.h @@ -143,7 +143,7 @@ class BrowserAccessibility { return html_attributes_; } int32 index_in_parent() const { return index_in_parent_; } - WebKit::WebRect location() const { return location_; } + gfx::Rect location() const { return location_; } BrowserAccessibilityManager* manager() const { return manager_; } const string16& name() const { return name_; } int32 renderer_id() const { return renderer_id_; } @@ -208,7 +208,7 @@ class BrowserAccessibility { int32 role_; int32 state_; string16 role_name_; - WebKit::WebRect location_; + gfx::Rect location_; std::vector<int32> indirect_child_ids_; // BrowserAccessibility objects are reference-counted on some platforms. diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm index 411e4c4..0df73af 100644 --- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm @@ -127,8 +127,8 @@ bool GetState(BrowserAccessibility* accessibility, int state) { // This is relative to webkit's top-left origin, not Cocoa's // bottom-left origin. - (NSPoint)origin { - return NSMakePoint(browserAccessibility_->location().x, - browserAccessibility_->location().y); + return NSMakePoint(browserAccessibility_->location().x(), + browserAccessibility_->location().y()); } // Returns a string indicating the role of this object. @@ -171,8 +171,8 @@ bool GetState(BrowserAccessibility* accessibility, int state) { // Returns the size of this object. - (NSSize)size { - return NSMakeSize(browserAccessibility_->location().width, - browserAccessibility_->location().height); + return NSMakeSize(browserAccessibility_->location().width(), + browserAccessibility_->location().height()); } // Returns the accessibility value for the given attribute. If the value isn't diff --git a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm index aea75d7..2b7cbba 100644 --- a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -47,26 +47,21 @@ class BrowserAccessibilityTest : public CocoaTest { virtual void SetUp() { CocoaTest::SetUp(); WebAccessibility root; - root.location.x = 0; - root.location.y = 0; - root.location.width = 500; - root.location.height = 100; + root.location.set_width(500); + root.location.set_height(100); root.role = WebAccessibility::ROLE_WEB_AREA; root.attributes[WebAccessibility::ATTR_HELP] = ASCIIToUTF16("HelpText"); WebAccessibility child1; child1.name = ASCIIToUTF16("Child1"); - child1.location.x = 0; - child1.location.y = 0; - child1.location.width = 250; - child1.location.height = 100; + child1.location.set_width(250); + child1.location.set_height(100); child1.role = WebAccessibility::ROLE_BUTTON; WebAccessibility child2; - child2.location.x = 250; - child2.location.y = 0; - child2.location.width = 250; - child2.location.height = 100; + child2.location.set_x(250); + child2.location.set_width(250); + child2.location.set_height(100); child2.role = WebAccessibility::ROLE_HEADING; root.children.push_back(child1); diff --git a/chrome/browser/accessibility/browser_accessibility_win.cc b/chrome/browser/accessibility/browser_accessibility_win.cc index 5b17979..5f38a03 100644 --- a/chrome/browser/accessibility/browser_accessibility_win.cc +++ b/chrome/browser/accessibility/browser_accessibility_win.cc @@ -509,14 +509,14 @@ STDMETHODIMP BrowserAccessibilityWin::get_imagePosition( HWND parent_hwnd = manager_->GetParentView(); POINT top_left = {0, 0}; ::ClientToScreen(parent_hwnd, &top_left); - *x = location_.x + top_left.x; - *y = location_.y + top_left.y; + *x = location_.x() + top_left.x; + *y = location_.y() + top_left.y; } else if (coordinate_type == IA2_COORDTYPE_PARENT_RELATIVE) { - *x = location_.x; - *y = location_.y; + *x = location_.x(); + *y = location_.y(); if (parent_) { - *x -= parent_->location().x; - *y -= parent_->location().y; + *x -= parent_->location().x(); + *y -= parent_->location().y(); } } else { return E_INVALIDARG; @@ -532,8 +532,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_imageSize(LONG* height, LONG* width) { if (!height || !width) return E_INVALIDARG; - *height = location_.height; - *width = location_.width; + *height = location_.height(); + *width = location_.width(); return S_OK; } diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 4c3e1f4..00177ad 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -20,13 +20,13 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/net/test_url_fetcher_factory.h" -#include "chrome/common/render_messages.h" #include "chrome/renderer/translate_helper.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/view_messages.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/background_contents_service.h b/chrome/browser/background_contents_service.h index ee29f07..1723ae7 100644 --- a/chrome/browser/background_contents_service.h +++ b/chrome/browser/background_contents_service.h @@ -11,9 +11,9 @@ #include "base/gtest_prod_util.h" #include "chrome/browser/tab_contents/background_contents.h" -#include "chrome/common/window_container_type.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/window_container_type.h" #include "googleurl/src/gurl.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/extensions/extension_messages_browsertest.cc b/chrome/browser/extensions/extension_messages_browsertest.cc index bd36a80..30cfbd8 100644 --- a/chrome/browser/extensions/extension_messages_browsertest.cc +++ b/chrome/browser/extensions/extension_messages_browsertest.cc @@ -8,6 +8,7 @@ #include "chrome/renderer/extensions/event_bindings.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/test/render_view_test.h" +#include "content/common/view_messages.h" #include "testing/gtest/include/gtest/gtest.h" static void DispatchOnConnect(int source_port_id, const std::string& name, diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 8d7873c..1eae3a6 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -14,12 +14,12 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_webnavigation_api_constants.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/provisional_load_details.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" +#include "content/common/view_messages.h" #include "net/base/net_errors.h" namespace keys = extension_webnavigation_api_constants; diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 0f9d064..a9412bd 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -32,8 +32,6 @@ #include "chrome/common/automation_messages.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" @@ -42,6 +40,7 @@ #include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "content/common/page_transition_types.h" +#include "content/common/view_messages.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 1a38437..c81ed2c 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -12,13 +12,12 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_details.h" #include "content/common/notification_source.h" +#include "content/common/view_messages.h" #include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" @@ -206,16 +205,16 @@ void FileSelectHelper::RunFileChooser( select_file_dialog_ = SelectFileDialog::Create(this); switch (params.mode) { - case ViewHostMsg_RunFileChooser_Params::Open: + case ViewHostMsg_RunFileChooser_Mode::Open: dialog_type_ = SelectFileDialog::SELECT_OPEN_FILE; break; - case ViewHostMsg_RunFileChooser_Params::OpenMultiple: + case ViewHostMsg_RunFileChooser_Mode::OpenMultiple: dialog_type_ = SelectFileDialog::SELECT_OPEN_MULTI_FILE; break; - case ViewHostMsg_RunFileChooser_Params::OpenFolder: + case ViewHostMsg_RunFileChooser_Mode::OpenFolder: dialog_type_ = SelectFileDialog::SELECT_FOLDER; break; - case ViewHostMsg_RunFileChooser_Params::Save: + case ViewHostMsg_RunFileChooser_Mode::Save: dialog_type_ = SelectFileDialog::SELECT_SAVEAS_FILE; break; default: diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index f374e1c..6860b13 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" -#include "chrome/common/render_messages_params.h" +#include "content/common/view_messages.h" #include "grit/generated_resources.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index bec3df77..7f44a9a 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -14,9 +14,9 @@ #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/view_types.h" -#include "chrome/common/window_container_type.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/common/notification_registrar.h" +#include "content/common/window_container_type.h" #include "webkit/glue/window_open_disposition.h" class TabContents; diff --git a/chrome/browser/prerender/prerender_observer.cc b/chrome/browser/prerender/prerender_observer.cc index c218d0b..e536c3d 100644 --- a/chrome/browser/prerender/prerender_observer.cc +++ b/chrome/browser/prerender/prerender_observer.cc @@ -7,8 +7,8 @@ #include "base/time.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/render_messages.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/view_messages.h" namespace prerender { diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index 1ec08bd..f3682e7 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -8,6 +8,7 @@ // errors happen because of a "#define Status int" in Xlib.h, which interacts // badly with net::URLRequestStatus::Status. #include "chrome/common/render_messages.h" +#include "content/common/view_messages.h" #include <cairo/cairo.h> #include <gdk/gdk.h> @@ -34,7 +35,6 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/common/native_web_keyboard_event.h" -#include "content/common/view_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 7129b3b..6d47bf4 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -17,7 +17,6 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/common/safebrowsing_messages.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" @@ -27,6 +26,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" +#include "content/common/view_messages.h" #include "googleurl/src/gurl.h" namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index d767e55..c6858c7 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -8,12 +8,11 @@ #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/common/pref_names.h" -#include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/common/view_messages.h" static const char* kGoogleURL = "http://www.google.com/"; static const char* kGoodURL = "http://www.goodguys.com/"; diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index e9ea273..8c92a0e 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -16,6 +16,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/common/notification_service.h" +#include "content/common/view_messages.h" #include "ui/gfx/rect.h" //////////////// diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h index 0cbcd36..70659c7 100644 --- a/chrome/browser/tab_contents/background_contents.h +++ b/chrome/browser/tab_contents/background_contents.h @@ -12,9 +12,9 @@ #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/view_types.h" -#include "chrome/common/window_container_type.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/common/notification_registrar.h" +#include "content/common/window_container_type.h" #include "webkit/glue/window_open_disposition.h" class TabContents; diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h index 1367f9f..4af68c8 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h @@ -9,8 +9,8 @@ #include <map> #include "base/basictypes.h" -#include "chrome/common/window_container_type.h" #include "content/browser/webui/web_ui_factory.h" +#include "content/common/window_container_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/gfx/rect.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/tabs/tab_finder.cc b/chrome/browser/tabs/tab_finder.cc index 6826316..9152564 100644 --- a/chrome/browser/tabs/tab_finder.cc +++ b/chrome/browser/tabs/tab_finder.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_observer.h" @@ -19,6 +18,7 @@ #include "content/common/notification_source.h" #include "content/common/notification_type.h" #include "content/common/page_transition_types.h" +#include "content/common/view_messages.h" class TabFinder::TabContentsObserverImpl : public TabContentsObserver { public: diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 48ec8da..5f1a40e 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -27,6 +27,7 @@ #include "content/common/notification_observer_mock.h" #include "content/common/notification_registrar.h" #include "content/common/notification_type.h" +#include "content/common/view_messages.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index e23d793..670a36f 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -10,7 +10,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" +#include "content/common/view_messages.h" #include "content/browser/tab_contents/tab_contents.h" namespace { |