Skip to content

Commit

Permalink
Cleanup: Update the path to gfx rect headers.
Browse files Browse the repository at this point in the history 
The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so
we are updating the include paths to fix this.

BUG=395370
TEST=compiles
TBR=sky@chromium.org,danakj@chromium.org

Review URL: https://codereview.chromium.org/823133004

Cr-Commit-Position: refs/heads/master@{#309814}
  • Loading branch information
@tfarina
tfarina authored and Commit bot committed Dec 31, 2014
1 parent 33fc100 commit 3b0452d
Show file tree
Hide file tree
Showing 426 changed files with 461 additions and 461 deletions.
2 changes: 1 addition & 1 deletion cc/resources/display_item.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

class SkCanvas;
class SkDrawPictureCallback;
Expand Down
2 changes: 1 addition & 1 deletion cc/resources/display_item_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "cc/base/cc_export.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/resources/display_item.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

class SkCanvas;
class SkDrawPictureCallback;
Expand Down
2 changes: 1 addition & 1 deletion cc/trees/property_tree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "base/basictypes.h"
#include "cc/base/cc_export.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/transform.h"

namespace cc {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/accessibility/accessibility_events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string>
#include "base/compiler_specific.h"
#include "ui/accessibility/ax_enums.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

class AccessibilityControlInfo;
class AccessibilityMenuInfo;
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/android/chrome_web_contents_delegate_android.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include "content/public/common/file_chooser_params.h"
#include "jni/ChromeWebContentsDelegateAndroid_jni.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/rect_f.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect_f.h"

#if defined(ENABLE_PLUGINS)
#include "chrome/browser/pepper_broker_infobar_delegate.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/compositor/layer/content_layer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/android/compositor/layer/layer.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

namespace cc {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/compositor/layer/tab_layer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include "ui/android/resources/ui_resource_android.h"
#include "ui/base/l10n/l10n_util_android.h"
#include "ui/gfx/geometry/insets_f.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/safe_integer_conversions.h"
#include "ui/gfx/point_f.h"
#include "ui/gfx/rect_f.h"
#include "ui/gfx/size.h"
#include "ui/gfx/transform.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/compositor/layer_title_cache.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include "jni/LayerTitleCache_jni.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/point_f.h"
#include "ui/gfx/rect_f.h"
#include "ui/gfx/size.h"

namespace chrome {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/compositor/tab_content_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "jni/TabContentManager_jni.h"
#include "ui/android/resources/ui_resource_provider.h"
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "url/gurl.h"

namespace {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/autofill/content_autofill_driver_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "content/public/test/test_utils.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace autofill {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/background/background_contents.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/view_type_utils.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

using content::SiteInstance;
using content::WebContents;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_thread.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"
#include "ui/views/controls/webview/web_dialog_view.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/display/overscan_calibrator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "ui/compositor/layer_delegate.h"
#include "ui/gfx/display.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace ui {
class Layer;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/first_run/steps/app_list_step.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ash/first_run/first_run_helper.h"
#include "chrome/browser/chromeos/first_run/step_names.h"
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/first_run/steps/help_step.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ash/first_run/first_run_helper.h"
#include "chrome/browser/chromeos/first_run/step_names.h"
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/first_run/steps/tray_step.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/i18n/rtl.h"
#include "chrome/browser/chromeos/first_run/step_names.h"
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

namespace chromeos {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/input_method/mode_indicator_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/memory/scoped_ptr.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget_observer.h"

namespace chromeos {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/input_method/textinput_test_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "ui/base/ime/mock_input_method.h"
#include "ui/base/ime/text_input_client.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/range/range.h"
#include "ui/gfx/rect.h"

namespace content {
class WebContents;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/existing_user_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "components/user_manager/user.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "url/gurl.h"

namespace base {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/help_app_launcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_registry.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

using content::BrowserThread;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/login_display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "chrome/browser/chromeos/login/signin_specifics.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"

namespace chromeos {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/login_display_host_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/events/event_utils.h"
#include "ui/gfx/display.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/size.h"
#include "ui/gfx/transform.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/login_display_host_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/gfx/display_observer.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/views/widget/widget_removals_observer.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/login_web_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/web_contents.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/mock_login_display.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "chrome/browser/chromeos/login/help_app_launcher.h"
#include "components/user_manager/user.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace chromeos {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "net/base/escape.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

namespace {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/user_adding_screen.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h"
#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/user_manager.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

#if !defined(USE_ATHENA)
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/ui/webui_login_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/common/renderer_preferences.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/widget/widget.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "content/public/test/test_utils.h"
#include "ui/aura/env.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/rect.h"

using wallpaper::WallpaperLayout;
using wallpaper::WallpaperInfo;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace chromeos {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/options/network_config_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/layout/layout_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/ui/accessibility_focus_ring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_H_

#include "ui/gfx/geometry/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace chromeos {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/time/time.h"
#include "chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h"
#include "ui/compositor/compositor_animation_observer.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace ui {
class Compositor;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/ui/focus_ring_layer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "ui/compositor/layer_delegate.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace aura {
class Window;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/devtools/devtools_contents_resizing_strategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/basictypes.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

// This class knows how to resize both DevTools and inspected WebContents
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/devtools/devtools_embedder_message_dispatcher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "base/callback.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/size.h"

namespace base {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/devtools/devtools_window_testing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/callback.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

class Browser;
class Profile;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#include "extensions/test/result_catcher.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skia_util.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/feedback_private/feedback_private_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/common/extensions/api/feedback_private.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace extensions {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/identity/web_auth_flow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
#include "extensions/browser/app_window/app_window_registry.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "url/gurl.h"

class Profile;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/tabs/tabs_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "extensions/common/manifest_constants.h"
#include "extensions/common/test_util.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/geometry/rect.h"

namespace extensions {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/bookmark_app_helper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
#include "ui/gfx/color_utils.h"
#include "ui/gfx/font.h"
#include "ui/gfx/font_list.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/canvas_image_source.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/rect.h"

namespace {

Expand Down
Loading

0 comments on commit 3b0452d

Please sign in to comment.