Fix references to ui/gfx headers in a*/.

ash/system/tray/special_popup_row.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/special_popup_row.h"
 
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace {
 
 const int kIconPaddingLeft = 5;
@@ skipping 104 matching lines @@
   container_bounds.ClampToCenteredSize(bounds.size());
   container_bounds.set_x(content_bounds.width() - container_bounds.width());
   button_container_->SetBoundsRect(container_bounds);
 
   bounds = content_->bounds();
   bounds.set_width(button_container_->x());
   content_->SetBoundsRect(bounds);
 }
 
 }  // namespace ash