summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge 89506 - Restore ability to specify the new tab page as a first-run tab ↵grt@chromium.org2011-06-181-1/+1
| | | | | | | | | | | | | | via installerdata/master_preferences. I suppose that an empty GURL used to trigger the NTP, but that is no longer the case. It appears that the right way to do this is to use chrome://newtab, for which we have a nice constant. BUG=86493 TEST=specify http://new_tab_page as a first_run_tab as per http://crbug/9706 and see that it works. Review URL: http://codereview.chromium.org/7205003 TBR=grt@chromium.org Review URL: http://codereview.chromium.org/7194002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@89582 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 89164 - [cros] Match NetworkLibrary error value with flimflam: UNKNOWN ↵nkostylev@chromium.org2011-06-181-1/+1
| | | | | | | | | | | | | | > NO_ERROR. BUG=chrome-os-partner:4058 TEST=Manual. Review URL: http://codereview.chromium.org/7169007 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/7191011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@89577 0039d316-1c4b-4281-b951-d872f2087c98
* Merge trunk r88533 to the 12.0.742 branchmark@chromium.org2011-06-133-41/+47
| | | | | | | | | | | | | | | | | Fix OS full-screen button on FutureCat. The full-screen button should trigger Chrome's full-screen mode. This should work properly even on subsequent clicks, when a window was already full-screened and then not-full-screened. BUG=85196 TEST=On FutureCat, use the full-screen button to go full-screen, then exit full-screen, then re-enter full-screen with the OS button again. Both times, Chrome's full-screen mode should be activated in the same way. Review URL: http://codereview.chromium.org/7003036 TBR=mark@chromium.org Review URL: http://codereview.chromium.org/7046113 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@88848 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 88440 - Change Chrome OS version numbers to Platform versions.rkc@chromium.org2011-06-081-0/+1
| | | | | | | | | | | | | | Changed the version parsing for Chrome OS if a special function has been called to strip out the leading 0. and major version number. Additionally changed about chrome os, about chrome os -> more info, about:version and the login screen to reflect version numbers more in tune with a 'platform' than OS. BUG=chromium-os:15789 TEST=Viewed all the screens and took screenshots. Screen shots of all effected screens are attached to the cros bug Review URL: http://codereview.chromium.org/7108019 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/7134029 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@88443 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85977 - linux: infobar for obsolete OSevan@chromium.org2011-06-032-31/+80
| | | | | | | | | | | | | | | | | | Merge 85946 - Refactor the "Learn more" DNS infobar shown on startup We will stop providing Chrome releases for Ubuntu Hardy-era distros. We should at least inform those users about this. (Retry of r85956, with views fix.) BUG=79401 TEST=tried manually changing code to require a newer GTK, saw infobar Review URL: http://codereview.chromium.org/7012024 Review URL: http://codereview.chromium.org/7088014 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87786 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 87638 - Merge 85977 - linux: infobar for obsolete OSevan@chromium.org2011-06-022-32/+1
| | | | | | | | | | | | | | | | | | | | We will stop providing Chrome releases for Ubuntu Hardy-era distros. We should at least inform those users about this. (Retry of r85956, with views fix.) BUG=79401 TEST=tried manually changing code to require a newer GTK, saw infobar Review URL: http://codereview.chromium.org/7012024 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/7058026 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/7088012 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87647 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85977 - linux: infobar for obsolete OSevan@chromium.org2011-06-022-1/+32
| | | | | | | | | | | | | | | | | We will stop providing Chrome releases for Ubuntu Hardy-era distros. We should at least inform those users about this. (Retry of r85956, with views fix.) BUG=79401 TEST=tried manually changing code to require a newer GTK, saw infobar Review URL: http://codereview.chromium.org/7012024 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/7058026 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87638 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 87082 - Several fixes to the UI for enabling SIM-locked modems.ers@chromium.org2011-05-272-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clicking "Enable Mobile Data" from either the network dropdown menu or the internet settings page results in the SIM unlock dialog being posted if the SIM is locked. - If the Enable button on the settings page was pressed, and the SIM unlock dialog is cancel, the Enable button, which had been disabled (greyed out) when clicked, is re-enabled. - If the correct PIN (or PUK) is entered, and the SIM becomes unlocked, we now perform the actual device enable operation. Also changed the definitions of the PIN error messages, to match an about-to-be-committed change made on the flimflam side. BUG=chromium-os-partner:3538 TEST=Press enable on the settings page, bringing up unlock dialog. - Cancel the dialog. See that the Enable button is active. - Enter an incorrect PIN and see that it behaves as before, i.e., the dialog stays up and reports the new retries-allowed count. - Enter the correct PIN and see that the device becomes enabled, and the button changes to "Disable Mobile Data". Try all three of the above scenarios using the Enable choice in the network dropdown menu, with and without any Chrome tab displaying the settings page. Make sure the results are the same as they were when the Enable button on the settings page was used (except of course, the Enable button won't be displayed, so the part where you check that it's active after cancelling doesn't apply. R=stevenjb@chromium.org,nkostylev@chromium.org,zelidrag@chromium.org Review URL: http://codereview.chromium.org/7075015 TBR=ers@chromium.org Review URL: http://codereview.chromium.org/7078011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87087 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86845 - Fix hittesting in the OpaqueBrowserFrameView for frames ↵pkasting@chromium.org2011-05-262-18/+11
| | | | | | | | | | | | | | | without a tabstrip. The HitTest() function was using GetBoundsForTabstrip(), which returns the ideal tabstrip bounds assuming a tabstrip were visible, instead of the actual tabstrip bounds. Also cleans up some unnecessarily verbose code. BUG=82524 TEST=Install a Chrome theme. Visit http://www.liveatc.net/search/?icao=ath and click the green "listen" button that "requires Java". A popup window with an infobar should appear. The infobar buttons should be clickable. Review URL: http://codereview.chromium.org/7071001 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/7071018 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86847 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86371 - Remove prefix elidingsail@chromium.org2011-05-2413-477/+1
| | | | | | | | | | | | | | | For M12 we experimented with eliding common prefixes in tab titles. After lots of feedback we've decided to remove this feature. BUG=83668 TEST=Testing Review URL: http://codereview.chromium.org/7067007 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/6992013 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86375 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86146 - dom-ui settings: Stop observing an existing BrowserDataRemover ↵cdn@chromium.org2011-05-231-2/+6
| | | | | | | | | | | before creating a new one. BUG=81916 TEST=Follow repro setps in bug report, verify that crash no longer occurs. Review URL: http://codereview.chromium.org/7050031 Review URL: http://codereview.chromium.org/7064003 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86314 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85800 - Sync: Check for NULL |flow_| as it's possible it's NULL if the ↵jhawkins@chromium.org2011-05-181-2/+4
| | | | | | | | | | | | | | | | | | Sync setup UI has not been initialized yet. BUG=82841 TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/7045013 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7034034 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85804 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85528:ben@chromium.org2011-05-182-0/+5
| | | | | | | We were returning the wrong value of ShouldUseNativeFrame for popup windows when a theme is installed and the rest of the desktop is in glass mode. We were returning false instead of true, even though themes are applied only to tabbed browser windows. This means that even though the window was rendered using the glass frame (due to a correct check somewhere else) the widget calculated the client size incorrectly. http://crbug.com/80774 TEST=none Review URL: http://codereview.chromium.org/7015057 Review URL: http://codereview.chromium.org/7030024 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85802 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85652 - Fix for crash in feedback.rkc@chromium.org2011-05-171-1/+2
| | | | | | | | | | | | | | | | | On sending the report, sometimes feedback seems to crash. It seems like the crash is happening in ClobberScreenshotSource, when we try to access tab_. Right before we call ClobberScreenshotSource, we CloseTabContents on the tab_ object; this probably isn't crashing in the majority case since the browser completely unloads the tab async, allowing ClobberScreenshotSource enough time to access the still valid tab_ object. There is no real reason to Clobber after the tab is closed, hence moving the call to before we actually close the tab and we're gauranteed to have a valid object in tab_ R=stevenjb@chromium.org,zelidrag@chromium.org BUG=15253 TEST=There is no repro for this crash, so we'll have to see if this gets fixed once we push this out to users. Review URL: http://codereview.chromium.org/7036013 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/7039015 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85655 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85581 - Workaround for clipping problems in Mac and Linux infobarsail@chromium.org2011-05-171-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Currently some infobar images are clipped. The problem is that the infobar image view is 26x26 but some infobar images are large. For M12 I'm working around this by doing the following: - Mac: change the image view in InfoBar.xip to be 32x32 and scale the image down if necessary - Linux: remove code that forces the image view to be 26 pixels wide I've also asked Cole to update the infobar icons to all be 26x26. Once the new icons are checked in I'll revert this change. Also see r81798 and r77328. BUG=80432 TEST=Testing Review URL: http://codereview.chromium.org/7034002 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/7037002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85585 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85169 - CrOS - Fix file selection dialog not respawning after closing ↵jamescook@chromium.org2011-05-128-1/+29
| | | | | | | | | | | | | | | | with esc (3) When the user hits escape, we need to call FileSelectionCanceled on the listener. Added OnWindowClosed() to HtmlDialogUIDelegate so we can catch this case. BUG=chromium-os:14698 TEST=Find or make a web page with a <input type=file /> element. Click on it to select a file. Cancel the file browser dialog with the escape key. Click on it again. Verify that the file browser reopens and works normally. Review URL: http://codereview.chromium.org/7014007 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/7016023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85182 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84973 - Crashing and hanging of Page info bubble fixedglotov@google.com2011-05-122-5/+14
| | | | | | | | | | | | BUG=chromium-os:13858 TEST=manual Review URL: http://codereview.chromium.org/6932043 TBR=glotov@google.com Review URL: http://codereview.chromium.org/6969033 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85117 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85011 - Fix for chrome://crashes on Chrome OSrkc@chromium.org2011-05-111-1/+7
| | | | | | | | | | | | | | | | | Chrome OS doesn't use the local state flag to indicate whether crash reporting is allowed or not. Instead it uses the cros metrics settings provider. Changed the chrome://crashes page to check that setting instead of the local_state flag. R=zelidrag@chromium.org,arv@chromium.org,estade@chromium.org BUG=chromium-os:14668 TEST=Tested with turning on crash reporting and using about:crash to generate crashes to confirm that they show up on the chrome://crashes page Review URL: http://codereview.chromium.org/7003018 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/7015014 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85069 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85061 - Allow the first-run bubble to be shown on organic first runs.ben@chromium.org2011-05-112-6/+13
| | | | | | | | | | | | | | | The code had some mysterious chokepoint that prevented the bubble from being shown if the attached parent window wasn't active. However the first run bubble is shown from the browser window's construction/init pass, before it's ever shown, so it can't be active. It turns out the chokepoint was to prevent the bubble from being shown later as the TemplateURLModel is loaded, so I moved the active check to that part of the code so that the initial display could work. http://crbug.com/78878 TEST=run chrome with --user-data-dir=c:\temp\test --first-run --organic (the user-data-dir MUST be empty!) - first run bubble should appear. also, browser window should render as active for at least 5-10 seconds after displaying. this code fixes a bug where running with just --first-run would have the browser appear inactive after about 3 seconds. Review URL: http://codereview.chromium.org/6973012 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/7015011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85063 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85033 - [cros] Show data plan info only when cellular network supports ↵nkostylev@chromium.org2011-05-111-1/+1
| | | | | | | | | | | | | | that. BUG=chrome-os-partner:3556 TEST=Manual. No messages like "No data plan" should be shown for GSM networks like AT&T. Review URL: http://codereview.chromium.org/7003027 TBR=nkostylev@chromium.org Review URL: http://codereview.chromium.org/6969020 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85050 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84926 - chromeos: refetch device properties when cellular modem powers on.ers@chromium.org2011-05-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the system starts up, chrome fetches the device properties for all network devices. However, for cellular devices, many of the Cellular.XXX properties don't become defined until the modem is enabled. Since chrome doesn't refetch the properties, nor are any property change signals sent out from flimflam for these properties (because generally speaking they are ones that don't change), chrome's cached copies are empty. The result is that when the Device tab is brought up in the internet settings page, all the fields are blank. Chrome now refetches device properties when it sees the value of the Powered property change. Also, I removed the LastUpdate item from the device tab. That property hasn't existed in flimflam for several months. BUG=chromium-os:14180 TEST=To demonstrate the problem without this fix, reboot the machine, go to internet settings, click "Options" for the cellular service, and go to the device tab. The fields should be blank. Log out and log back in, and the fields in the device tab should be populated, because chrome restarted and thus fetched the properties again. With this fix in place, the fields should be populated first time, every time. R=nkostylev@chromium.org,zel@chromium.org Review URL: http://codereview.chromium.org/6903080 TBR=ers@chromium.org Review URL: http://codereview.chromium.org/7005024 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84937 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84723 - Options: Disconnect the Instant option from the search engine ↵jhawkins@chromium.org2011-05-101-1/+0
| | | | | | | | | | | | | | | | select. BUG=81356 TEST=none R=sky@chromium.org Review URL: http://codereview.chromium.org/6980010 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7002010 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84868 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84655 - [Mac] Mark BrowserWindowController's window as non-restorable.rsesek@chromium.org2011-05-101-3/+11
| | | | | | | | | | | | BUG=79113 TEST=On FutureCat, browse around for a few minutes, opening multiple tabs and switching applications. Try to quit Chromium. It quits. Review URL: http://codereview.chromium.org/6971002 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/7001002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84830 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84793 - [ChromeOS] Move help and feedback button into wrench menu.xiyuan@chromium.org2011-05-103-47/+13
| | | | | | | | | | | | | | | | | - Remove feedback button from toolbar; - Remove feedback entry in "Tools" submenu and put it into top-tier wrench menu for ChromeOS; - Remove help app icon by removing "brwoser_action" from its manifest; - Add an icon for help menu; BUG=chromium-os:11435 TEST=Verify fix for chromium-os:11435 Review URL: http://codereview.chromium.org/6992001 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6993011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84794 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84775 - [cros] all images on changePicture page, capture and pick are ↵avayvod@chromium.org2011-05-102-25/+7
| | | | | | | | | | | | | | | | | first Fixed layout on image screen. Fixed html layout on changePicture page. BUG=chromiumos:14618 TEST=Check that all images on both OOBE image screen and change picture page are aligned. Verify that all 17 avatars are visible and selectable on the page. Review URL: http://codereview.chromium.org/6968006 TBR=avayvod@chromium.org Review URL: http://codereview.chromium.org/6993010 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84785 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84778 - Use Cellular.SupportNetworkScan instead of IMSI to show scan ↵dpolukhin@chromium.org2011-05-101-2/+1
| | | | | | | | | | | | | | mobile network BUG=chromium-os:14773 TEST=manual Review URL: http://codereview.chromium.org/6995014 TBR=dpolukhin@chromium.org Review URL: http://codereview.chromium.org/6991008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84784 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84647 - Don't reserve any space for infobar arrows when the container ↵pkasting@chromium.org2011-05-093-6/+10
| | | | | | | | | | | | | delegate doesn't want them drawn. This will hopefully fix a layout problem in Chrome Frame, which can't overlap the infobar container with anything above it the way Chrome can. BUG=81749 TEST=Chrome frame infobars don't result in black gaps above them Review URL: http://codereview.chromium.org/6956005 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/6971003 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84651 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84582 - Added missing file for previous CL. Clang build fix.zelidrag@chromium.org2011-05-081-3/+3
| | | | | | | | | | | | BUG=chromium-os:15023 TEST=none TBR=thakis Review URL: http://codereview.chromium.org/6965002 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6967002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84584 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84548 - Fix dangerous downloads. Ellipsis for long filenames.achuith@chromium.org2011-05-071-3/+8
| | | | | | | | | | | BUG=chromium-os:15048,chromium-os:15049 TEST=Go to achuithz600.mtv.corp.google.com/www/files. Download the crx file and the file with the long name to test dangerous downloads and long filename fix respectively. Review URL: http://codereview.chromium.org/6948013 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/6952017 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84549 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84385 - Several file browser + media player cleanup items:zelidrag@chromium.org2011-05-061-2/+1
| | | | | | | | | | | | | | | | | 1. Landing http://codereview.chromium.org/6905093/ and http://codereview.chromium.org/6893056/ on behalf of serya@ Setting icon for slideshow in filebrowser. 2. Added the final list of supported media file containers. BUG=chromium-os:14557, chromium-os:14542 TEST=Select a JPEG file in the filebrowser. Ensure the "View image" button has the right icon. Review URL: http://codereview.chromium.org/6929040 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6929058 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84394 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build break.achuith@chromium.org2011-05-061-1/+1
| | | | | | | TBR:zel Review URL: http://codereview.chromium.org/6930058 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84369 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84276 - Refactor active_downloads. Fix a number of download-related bugs.achuith@chromium.org2011-05-053-533/+105
| | | | | | | | | | | BUG=chromium-os:12855,chromium-os:14385,chromium-os:11035,chromium-os:13424,chromium-os:8778,chromium-os:8252,chromium-os:14702 TEST=requires manual testing of all features. Review URL: http://codereview.chromium.org/6878087 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/6929050 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84338 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 84309 (rsesek is uncomfortable about merging this) - Merge 83125 - ↵thakis@chromium.org2011-05-0512-95/+116
| | | | | | | | | | | | | | | | | | Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_state_mac.h). BUG=none TEST=covered by tests Review URL: http://codereview.chromium.org/6904026 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/6927058 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/6930048 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84311 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 83125 - Add and use gfx::ScopedNSGraphicsContextState ↵thakis@chromium.org2011-05-0512-116/+95
| | | | | | | | | | | | | | | (ui/gfx/scoped_ns_graphics_context_state_mac.h). BUG=none TEST=covered by tests Review URL: http://codereview.chromium.org/6904026 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/6927058 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84309 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84270 - [cros] Add support for carrier deals.nkostylev@chromium.org2011-05-051-0/+11
| | | | | | | | | | | | | | | | | - Expose carrierID (homeProvider). - Check for deal validity (locale, date). - Add deal notification text to 3G promo bubble. - Use top up URL from carrier deal as "View Account" link in network menu/promo. BUG=chromium-os:14575, chromium-os:14671 TEST=Manual. Used manifest with deal for local provider, checked that UI elements are customized. Review URL: http://codereview.chromium.org/6929011 TBR=nkostylev@chromium.org Review URL: http://codereview.chromium.org/6930043 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84292 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84238 - Fix clang error below:mirandac@chromium.org2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | /b/build/slave/Mac_Clang__dbg_/build/src/chrome/browser/ui/cocoa/first_run_dialog.mm:152:13:error: '&&' within '||' [-Werror,-Wlogical-op-parentheses] model && !model->is_default_search_managed()) { ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /b/build/slave/Mac_Clang__dbg_/build/src/chrome/browser/ui/cocoa/first_run_dialog.mm:152:13: note: place parentheses around the '&&' expression to silence this warning model && !model->is_default_search_managed()) { ^ ( ) 1 error generated. TBR: sheriff maf when he wakes up. :-) Review URL: http://codereview.chromium.org/6935023 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/6927047 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84259 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84235 - Turn off the search engine selector for the Russian locale.mirandac@chromium.org2011-05-053-3/+9
| | | | | | | | | | | BUG=81578 TEST=no search engine selector in organic builds in Russian locale. Review URL: http://codereview.chromium.org/6927022 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/6927046 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84258 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84144 - [cros] Added choice of default images to image screen for new ↵avayvod@chromium.org2011-05-051-2/+3
| | | | | | | | | | | | | | | users. R=dpolukhin@chromium.org BUG=chromium-os:14618 TEST=Login as a new user, verify that both default image can be selected or photo can be taken and the choice is shown on the login screen/screen lock immediately. Review URL: http://codereview.chromium.org/6880274 TBR=avayvod@chromium.org Review URL: http://codereview.chromium.org/6929031 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84205 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84184 - Fix multiple problems with infobar/bookmark bar resizing:pkasting@chromium.org2011-05-056-35/+46
| | | | | | | | | | | | | | | * The infobar wouldn't tell the browser it was done animating when the height hadn't also changed from the previously-calculated height, so frequently the content wouldn't properly relayout after infobar animation. I think this was the cause of bug 79108. * A silly bug in ToolbarSizeChanged() meant that we never did re-layout on the content area when the toolbar stopped animating, because we were checking for "call_state == NORMAL" while the AutoReset object was still alive and guaranteeing that the state would not be NORMAL. This caused bug 80142. * I reversed the enum values for the recursive call state, so recursive ToolbarSizeChanged() calls were all getting "can use fast resize" backwards. BUG=79108,80142 TEST=Visit a page with a vertical scrollbar. Toggle the bookmark bar on. Once the bar stops animating the scrollbar should redraw so it's once again fully on-screen. Review URL: http://codereview.chromium.org/6927032 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/6929028 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84186 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84143 - Remove stale ChromeOS code in ↵stevenjb@google.com2011-05-051-14/+0
| | | | | | | | | | | | | | PersonalOptionsHandler::ShowSyncActionDialog BUG=chromium-os:14839 TEST=Test sync failures on ChromeOS (shouldn't crash) / check crash reports Review URL: http://codereview.chromium.org/6927021 TBR=stevenjb@google.com Review URL: http://codereview.chromium.org/6935013 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84168 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84146 - Cros - Fix crash on file browser save/open/canceljamescook@chromium.org2011-05-041-1/+1
| | | | | | | | | | | | | | | | Close the file browser window in C++, rather than via window.close() in JavaScript because window.close() is no longer working. This prevents crashes in listeners that expect to only be called once. BUG=chromium-os:14524 TEST=Exercise file browser: Hit control-O to open, then cancel the dialog. Hit control-O to open, then open an image. Right-click save an image, cancel dialog. Right-click save an image, save it. Insert USB drive with images, preview individual images, open them, run a slideshow. Review URL: http://codereview.chromium.org/6935006 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/6930022 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84147 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84073 - Fix window widgets.avi@chromium.org2011-05-042-14/+9
| | | | | | | | | | | | | | Always force re-layout of window on load. BUG=81446 TEST=as in bug Review URL: http://codereview.chromium.org/6909039 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6933013 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84123 0039d316-1c4b-4281-b951-d872f2087c98
* Resolve merge issues and add new gray theme for cros.davemoore@chromium.org2011-05-043-29/+70
| | | | | | | This is a merge of http://src.chromium.org/viewvc/chrome?view=rev&revision=83729 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84040 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84005 - Mac. Ensure no more than one visibly selected item in each ↵maf@chromium.org2011-05-044-41/+81
| | | | | | | | | | | | | | | | | | bookmark folder menu. Make the BookmarkBarFolderButtonCell not hover select itself (by overriding setMouseInside to do nothing). Instead have the controller manage the selection, which enables selection to be moved from the keyboard or mouse without two selections appearing. Remove the [BookmarkBarFolderController toggleButtonBorderingWhileMouseInside] hack which was only necessary because of a bug in [GradientButtonCell updateTrackingAreas] that unexpectedly changed the isMouseInside_ state. Add new logic to [BookmarkBarFolderController performOneScroll] to make it detect an existing mouse-initiated selection. If one is present before scroll it will select whatever item ends up under the mouse after the scroll. Otherwise no selection change will happen, which is right. BUG=75014,77676,80043,81072,46595 Review URL: http://codereview.chromium.org/6889025 TBR=maf@chromium.org Review URL: http://codereview.chromium.org/6927001 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84010 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 83974 - Add a check to test an assumption about view NULLness.ben@chromium.org2011-05-031-0/+1
| | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/6902210 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/6905171 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83976 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 83959 - Merge 83729 - Implement new gray mock.davemoore@chromium.org2011-05-033-70/+29
| | | | | | | | | | | | | | | BUG=chromium-os:14276 TEST=Login, examine both regular and OTR, and test with and without themes. Review URL: http://codereview.chromium.org/6904160 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/6910036 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/6910038 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83960 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 83729 - Implement new gray mock.davemoore@chromium.org2011-05-033-29/+70
| | | | | | | | | | | | BUG=chromium-os:14276 TEST=Login, examine both regular and OTR, and test with and without themes. Review URL: http://codereview.chromium.org/6904160 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/6910036 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83959 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 83739 - Force first run search engine ballot to always appear on front.mirandac@chromium.org2011-05-021-0/+1
| | | | | | | | | | | BUG=80237 TEST=existing tests Review URL: http://codereview.chromium.org/6880344 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/6889007 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83781 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 83444 - Fix crash in RenderViewContextMenuViews::RunMenuAt. As part of ↵sky@chromium.org2011-05-024-23/+3
| | | | | | | | | | | | | | | | | fixing this I'm centralizing how we notify the view of menu showing/hiding. BUG=80099 80879 TEST=none R=estade@chromium.org,ben@chromium.org Review URL: http://codereview.chromium.org/6901075 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/6889006 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83780 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 82859 - Fixes another case of object getting deleted while menu is showingsky@chromium.org2011-05-022-1/+17
| | | | | | | | | | | | | | | | | | causing problems. We seem to get a never ending stream of bugs because of this. I'm beginning to think we should convert to using non-native menus and no longer block in Run. That way problems like this should go away. BUG=80099 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/6882105 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/6914002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83779 0039d316-1c4b-4281-b951-d872f2087c98