summaryrefslogtreecommitdiffstats
path: root/ash/wm/frame_painter.cc
Commit message (Collapse)AuthorAgeFilesLines
...
* Revert r168447 "Makes windows obey their maximum size constraints on chromeos."oshima@chromium.org2012-11-171-4/+0
| | | | | | | | | | | | | | | - Prevents windows from resizing bigger than their max size - Prevents windows from snapping when they have max size defined - Prevents windows from maximizing when they have max size defined This broke win_aura/linux_aura BUG=152065 TBR=koz@chromium.org Review URL: https://codereview.chromium.org/11316068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168454 0039d316-1c4b-4281-b951-d872f2087c98
* Makes windows obey their maximum size constraints on chromeos.koz@chromium.org2012-11-171-0/+4
| | | | | | | | | | | | | | - Prevents windows from resizing bigger than their max size - Prevents windows from snapping when they have max size defined - Prevents windows from maximizing when they have max size defined BUG=152065 Review URL: https://chromiumcodereview.appspot.com/11366215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168447 0039d316-1c4b-4281-b951-d872f2087c98
* views: Improve the constant names of the ButtonState enum.tfarina@chromium.org2012-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | We rename then to STATE_FOO, so it is less confusing: Rather than: if (state == views::CustomButton::BS_HOT) { ... } We now have: if (state == views::CustomButton::STATE_HOVERED) { ... } A bit more verbose, but much better to read. R=sky@chromium.org TBR=jochen@chromium.org # for content/shell Review URL: https://chromiumcodereview.appspot.com/11275272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167684 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Add immersive mode button to frame, behind flagjamescook@chromium.org2012-11-141-7/+49
| | | | | | | | | | | | | Button to trigger experimental immersive mode, does nothing useful yet. Added behind --ash-immersive flag. BUG=160114 TEST=Added to ash_unittests FramePainterTest Review URL: https://chromiumcodereview.appspot.com/11360176 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167553 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Fix solo window header transparency after workspace switchjamescook@chromium.org2012-11-081-13/+38
| | | | | | | | | | | | | Switching between workspaces needs to update the window header transparency because it may make a single window visible. BUG=153878 TEST=Added to ash_unittests FramePainterTest.UseSoloWindowHeader Review URL: https://chromiumcodereview.appspot.com/11392003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166609 0039d316-1c4b-4281-b951-d872f2087c98
* Fix crash bugs of FramePainter.mukai@chromium.org2012-10-171-3/+14
| | | | | | | | | | | | | Sometimes FramePainter is deleted without its window's OnWindowDestroying, so removing the kSoloWindowFramePainterKey property explicitly at the destructor. Also this CL adds the checks of painter's frame_ and its non_client_view() since they may be NULL on window destroying timing on test. BUG=155634 TEST=ash_unittests passed with the new test Review URL: https://chromiumcodereview.appspot.com/11194015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162432 0039d316-1c4b-4281-b951-d872f2087c98
* Removes worskpace 1 code. Will rename next.sky@chromium.org2012-10-171-7/+3
| | | | | | | | | | | BUG=none TEST=none R=ben@chromium.org,nkostylev@chromium.org TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11201002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162420 0039d316-1c4b-4281-b951-d872f2087c98
* Makes gfx::Screen an instance, rather than a collection of static methods.scottmg@chromium.org2012-10-121-1/+1
| | | | | | | | | | | | | | This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows. Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously. BUG=133312 Review URL: https://chromiumcodereview.appspot.com/11030017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
* Uses "SoloWindow" transparent header for each display.mukai@chromium.org2012-10-011-27/+66
| | | | | | | | | | BUG=139234 TEST=run on Goobuntu with --aura-host-window-size='800+0-1000x600,800+700-1000x400' flag. ash_unittests passed. Review URL: https://chromiumcodereview.appspot.com/10991042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159560 0039d316-1c4b-4281-b951-d872f2087c98
* Handle titlebar text updates properlyskuhne@google.com2012-10-011-10/+21
| | | | | | | | | | | Previously the area of the text was not invalidated prior to the title drawing. As such all kind of results were possible. BUG=152597, 151827 TEST=visual Review URL: https://codereview.chromium.org/10993087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159494 0039d316-1c4b-4281-b951-d872f2087c98
* Attempt 3 at: Fixes dragging a tab out of a mazimixed window. Wesky@chromium.org2012-09-281-3/+14
| | | | | | | | | | | | | | | | | | | needed to honor the 'tracked by workspace' property. I added test coverage of this too. When ending the drag TabDragController reset the 'tracked by workspace' property. This could result in the window bounds changing notifying the observer and attempting to update this. I've moved around a variable so that doesn't happen. BUG=151218 TEST=covered by tests now, but see bug for repro steps. R=ben@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/10979087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159343 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 159316 - Attempt 2 at: Fixes dragging a tab out of a mazimixed window. Wesky@chromium.org2012-09-281-14/+3
| | | | | | | | | | | | | | | | | | | | | | needed to honor the 'tracked by workspace' property. I added test coverage of this too. First attempt failed as my new test was sporadically failing. It was failing because of an uninitiailized variable in ToplevelWindowEventHandler that lead to ToplevelWindowEventHandler occassionally consuming the gesture and the tabstrip not getting the event. BUG=151218 TEST=covered by tests now, but see bug for repro steps. R=ben@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/10986099 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/10993088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159320 0039d316-1c4b-4281-b951-d872f2087c98
* Attempt 2 at: Fixes dragging a tab out of a mazimixed window. Wesky@chromium.org2012-09-281-3/+14
| | | | | | | | | | | | | | | | | | | needed to honor the 'tracked by workspace' property. I added test coverage of this too. First attempt failed as my new test was sporadically failing. It was failing because of an uninitiailized variable in ToplevelWindowEventHandler that lead to ToplevelWindowEventHandler occassionally consuming the gesture and the tabstrip not getting the event. BUG=151218 TEST=covered by tests now, but see bug for repro steps. R=ben@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/10986099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159316 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 159276 - Fixes dragging a tab out of a mazimixed window. We needed to ↵sky@chromium.org2012-09-281-14/+3
| | | | | | | | | | | | | | | | | honor the 'tracked by workspace' property. I added test coverage of this too. BUG=151218 TEST=covered by tests now, but see bug for repro steps. R=ben@chromium.org Review URL: https://codereview.chromium.org/10993071 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/10977084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159291 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes dragging a tab out of a mazimixed window. We needed to honor thesky@chromium.org2012-09-281-3/+14
| | | | | | | | | | | | 'tracked by workspace' property. I added test coverage of this too. BUG=151218 TEST=covered by tests now, but see bug for repro steps. R=ben@chromium.org Review URL: https://codereview.chromium.org/10993071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159276 0039d316-1c4b-4281-b951-d872f2087c98
* Center text in message box captions.skuhne@chromium.org2012-09-271-5/+4
| | | | | | | | | | BUG=152579 TEST=visual Review URL: https://chromiumcodereview.appspot.com/10996050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159139 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug where frame wasn't correctly repainting when going fromsky@chromium.org2012-09-191-3/+24
| | | | | | | | | | | | | | | snapped to top to not snapped to top. The coordinates here aren't quite right, but I'll fix that separately. BUG=149968 TEST=see bug R=jamescook@chromium.org Review URL: https://chromiumcodereview.appspot.com/10945023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157657 0039d316-1c4b-4281-b951-d872f2087c98
* Change window header size for applications which are popupsskuhne@chromium.org2012-09-161-3/+3
| | | | | | | | | | | | BUG=145618 TEST=visual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=156993 Review URL: https://chromiumcodereview.appspot.com/10905300 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157042 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156993 - Change window header size for applications which are popupsavi@chromium.org2012-09-151-3/+3
| | | | | | | | | | | | | | Broke BrowserNonClientFrameViewAshTest.UseShortHeader . BUG=145618 TEST=visual Review URL: https://chromiumcodereview.appspot.com/10905300 TBR=skuhne@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157008 0039d316-1c4b-4281-b951-d872f2087c98
* Change window header size for applications which are popupsskuhne@chromium.org2012-09-151-3/+3
| | | | | | | | | | BUG=145618 TEST=visual Review URL: https://chromiumcodereview.appspot.com/10905300 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156993 0039d316-1c4b-4281-b951-d872f2087c98
* Right to left caption paintining: Divider line between close and maximize in ↵skuhne@chromium.org2012-09-151-1/+3
| | | | | | | | | | | | wrong location BUG=148789 TEST=visual Review URL: https://chromiumcodereview.appspot.com/10918250 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156982 0039d316-1c4b-4281-b951-d872f2087c98
* (reland r156610)oshima@chromium.org2012-09-131-1/+1
| | | | | | | | | | | | | add ash_resources.grd and necessary changes to use images in ash/resources BUG=146034 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156610 Review URL: https://codereview.chromium.org/10905242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156637 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r156610 "add ash_resources.grd and necessary changes to use images in ↵oshima@chromium.org2012-09-131-1/+1
| | | | | | | | | | ash/resources" TBR=oshima@chromium.org BUG=146034 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156614 0039d316-1c4b-4281-b951-d872f2087c98
* add ash_resources.grd and necessary changes to use images in ash/resourcesoshima@chromium.org2012-09-131-1/+1
| | | | | | | | | BUG=146034 TEST=none Review URL: https://codereview.chromium.org/10905242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156610 0039d316-1c4b-4281-b951-d872f2087c98
* The new close assets are only intended for when the frame is actuallysky@chromium.org2012-09-131-5/+5
| | | | | | | | | | | | | | maximized. So, use them only in that case (panels/dialogs pass in true even though they aren't maximized). BUG=148848 TEST=see bug R=jamescook@chromium.org Review URL: https://chromiumcodereview.appspot.com/10910244 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156604 0039d316-1c4b-4281-b951-d872f2087c98
* Makes FramePainter not animate the header if the parent (a workspace)sky@chromium.org2012-09-121-5/+20
| | | | | | | | | | | | | | | | is already animating. Doing so leads to lots of painting when switching workspaces and a bad frame rate for the animation. The rationale for disabling here is that if you are switching worskpaces, you're not going to notice the header animating. BUG=147350 TEST=none R=jamescook@chromium.org Review URL: https://chromiumcodereview.appspot.com/10917214 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156339 0039d316-1c4b-4281-b951-d872f2087c98
* Adding proper dragging behavior for L/R maximized windows.skuhne@chromium.org2012-09-111-0/+40
| | | | | | | | | | | | BUG=141750 TEST=unit tests & visual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=155840 Review URL: https://chromiumcodereview.appspot.com/10918077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156058 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 155840 - Adding proper dragging behavior for L/R maximized windows.khorimoto@chromium.org2012-09-101-40/+0
| | | | | | | | | | | | | BUG=141750 TEST=unit tests & visual Review URL: https://chromiumcodereview.appspot.com/10918077 TBR=skuhne@chromium.org Review URL: https://chromiumcodereview.appspot.com/10919198 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155854 0039d316-1c4b-4281-b951-d872f2087c98
* Adding proper dragging behavior for L/R maximized windows.skuhne@chromium.org2012-09-101-0/+40
| | | | | | | | | | BUG=141750 TEST=unit tests & visual Review URL: https://chromiumcodereview.appspot.com/10918077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155840 0039d316-1c4b-4281-b951-d872f2087c98
* New maximize assets for workspace2. Images have been pngcrushed.sky@chromium.org2012-09-101-1/+15
| | | | | | | | | | BUG=none TEST=none R=oshima@chromium.org Review URL: https://chromiumcodereview.appspot.com/10907142 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155742 0039d316-1c4b-4281-b951-d872f2087c98
* Short circuits drawing top frame top when maximized. When animatingsky@chromium.org2012-09-081-2/+4
| | | | | | | | | | | | | | its possible for the window the be maximized but it's origin not yet 0, leading to the line being incorrectly drawn. BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10919168 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155602 0039d316-1c4b-4281-b951-d872f2087c98
* Makes the frame totally transparent when maximized with workspace2.sky@chromium.org2012-09-041-0/+5
| | | | | | | | | | BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10909055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154756 0039d316-1c4b-4281-b951-d872f2087c98
* Makes workspace 2 show an alternate background (system background)sky@chromium.org2012-08-271-4/+8
| | | | | | | | | | | | | | beneath the desktop when a window is maximized. This background is visible during the animation and behind the launcher. BUG=137342 TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10875070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153509 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Fix touch-resizing windows.sadrul@chromium.org2012-08-241-3/+1
| | | | | | | | | | | | LAYOUT_TOUCH isn't used on chromeos anymore. So always check to see if there is an active touch-point, and use touch-appropriate bounds for window resizing. BUG=none Review URL: https://chromiumcodereview.appspot.com/10827451 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153264 0039d316-1c4b-4281-b951-d872f2087c98
* Prepare a bunch of ash tests for workspace2. With Workspace2 you can'tsky@chromium.org2012-08-161-0/+6
| | | | | | | | | | | | | | add to the default container, instead you need to go through the StackingClient. BUG=137342 TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10857021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151848 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Use different hit-test outer-region for mouse and touch events.sadrul@chromium.org2012-08-091-7/+5
| | | | | | | | | | | | The hit-region for windows need to be larger for touch events to allow resizing windows easily, while continuing to use a smaller hit-region for mouse-events. BUG=135187 Review URL: https://chromiumcodereview.appspot.com/10854060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150870 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Export some constants for some code cleanup.sadrul@chromium.org2012-08-081-10/+0
| | | | | | | | BUG=none Review URL: https://chromiumcodereview.appspot.com/10825249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150586 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes missing 5 pixel inset for inactive tab theme background and theme ↵pkotwicz@chromium.org2012-08-071-5/+9
| | | | | | | | | | | | | | | | | background for new tab button in Ash. The theme background is correctly inset by 5 pixels. In frame_painter.cc Added GetThemeBackgroundXInset such that the x inset can be queried. BUG=137090 TEST=Inactive tab theme background lines up for "Kate Spades", "Quilt", and "Wooded Chrome Theme by Everplex" with theme background for toolbar. In particular, "Wooded Chrome Theme By Everplex" should behave the same way it does on Mac and Windows. So, the theme should NOT line up with the NTP image. Review URL: https://chromiumcodereview.appspot.com/10816004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150354 0039d316-1c4b-4281-b951-d872f2087c98
* Adding new maximize menu according to specification.skuhne@chromium.org2012-08-041-14/+8
| | | | | | | | | | BUG=132686 TEST=Visually tested Review URL: https://chromiumcodereview.appspot.com/10823025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150012 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing problems with constrained windows (i.e. print preview)skuhne@chromium.org2012-08-011-1/+5
| | | | | | | | | BUG=135103, 135096, 135116 Review URL: https://chromiumcodereview.appspot.com/10826085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149497 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Update window frame art and transparency valuesjamescook@chromium.org2012-07-301-3/+3
| | | | | | | | | | | | | | Per kuscher@ we'd like to try: * Active and inactive windows 100% opaque * Solo window 30% opaque * New art assets for active and inactive window frames BUG=137340 TEST=visual, with 2 windows open the active window should have an opaque darker frame and the inactive window should have an opaque lighter frame Review URL: https://chromiumcodereview.appspot.com/10825086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149006 0039d316-1c4b-4281-b951-d872f2087c98
* Makes the min window size include the OTR image and caption buttons onsky@chromium.org2012-07-251-0/+7
| | | | | | | | | | | | | chromeos. BUG=131918 TEST=see bug R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10821002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148358 0039d316-1c4b-4281-b951-d872f2087c98
* Rename bounds accessors to be intuitive and consistentoshima@chromium.org2012-07-191-1/+1
| | | | | | | | | | | | | | | | | | GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen Get/Set ParentBounds -> Get/Set BoundsInParent GetWorkAreaScreenBounds -> GetWorkAreaBoundsInScreen GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen GetWindowScreenBounds -> GetWindowBoundsInScreen GetScreenBounds -> GetBoundsInScreen GetRootWindowBounds -> GetBoundsInRootWindow BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10795013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147499 0039d316-1c4b-4281-b951-d872f2087c98
* Center title text vertically in touch layout.harrym@chromium.org2012-07-171-1/+4
| | | | | | | | | | BUG=132840 TEST=visual confirmation via ash_shell Review URL: https://chromiumcodereview.appspot.com/10695091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147115 0039d316-1c4b-4281-b951-d872f2087c98
* This CL moves the contents of ui_resources_standard.grd into ↵benrg@chromium.org2012-07-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ui_resources.grd and theme_resources_standard.grd into theme_resources.grd. This also eliminates the following Grit outputs: ui_resources.pak ==> duplicated in each scaled-resource pak ui_resources_standard.h ==> merged into ui_resources.h ui_resources_standard_map.h ==> renamed to ui_resources_map.h ui_resources_standard_map.cc ==> renamed to ui_resources_map.cc theme_resources.rc ==> merged into theme_resources_standard.rc theme_resources.pak ==> duplicated in each scaled-resource pak theme_resources_standard.h ==> merged into theme_resources.h theme_resources_standard_map.h ==> merged into theme_resources_map.h theme_resources_standard_map.cc ==> merged into theme_resources_map.cc The image duplication is intentional; we may revisit this later. Currently the standard-size images are included twice in the Windows build, once as an rc and once as a pak. I'll fix this in a followup CL. TBR=ben@chromium.org,brettw@chromium.org,darin@chromium.org,stevenjb@chromium.org BUG=133570 TEST=Trybots, local build Review URL: https://chromiumcodereview.appspot.com/10756018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146224 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Touch-optimize the window-resize region for touch-events only.sadrul@chromium.org2012-07-031-3/+8
| | | | | | | | | | | | | Both mouse and touch-events are possible in touch-optimized UI. But for hit-testing, use touch-optimization only for touch/gesture-events, and not for mouse-events. BUG=135187 TEST=manually Review URL: https://chromiumcodereview.appspot.com/10703069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145359 0039d316-1c4b-4281-b951-d872f2087c98
* Adds factory method to create Bitmap shader which displays correctly in High DPIpkotwicz@chromium.org2012-07-021-19/+6
| | | | | | | | | | | | | | | | Added DrawImageInPath to Canvas API. BUG=None TEST=Manual Test Steps: Change the resize code in tray_user to properly resize based on scale factor (See TODO) Run with --force-device-scale-factor=2 --load-2x-resources Ensure that tray user avatars are not blurry Review URL: https://chromiumcodereview.appspot.com/10720003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145176 0039d316-1c4b-4281-b951-d872f2087c98
* Relanding r144499:oshima@chromium.org2012-06-271-2/+2
| | | | | | | | | | | | | Rename the remaining usage of Monitor to Display BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144499 Review URL: https://chromiumcodereview.appspot.com/10675011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144585 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r 144499 "Rename the remaining usage of Monitor to Display"oshima@chromium.org2012-06-271-2/+2
| | | | | | | | | | | | Temporarily reverting rename change to investigate 133784 TBR=oshima@chromium.org BUG=123160 TEST=none Review URL: https://chromiumcodereview.appspot.com/10689014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144573 0039d316-1c4b-4281-b951-d872f2087c98
* Rename the remaining usage of Monitor to Displayoshima@chromium.org2012-06-271-2/+2
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10675011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144499 0039d316-1c4b-4281-b951-d872f2087c98