summaryrefslogtreecommitdiffstats
path: root/ui/base/models
Commit message (Collapse)AuthorAgeFilesLines
* ui: Change ListModel::RemoveAt() API to return a scoped_ptr<ItemType>tfarina@chromium.org2013-11-091-7/+9
| | | | | | | | | | | | | | | | | | This should make the ownership model more explicit, since it is very easy to miss the ownership transfer. Inspired by Xiyuan's comment in: https://codereview.chromium.org/63123003/diff/80001/ui/app_list/app_list_item_list.h#newcode60 BUG=316924 TEST=app_list_unittests, ui_unittests R=xiyuan@chromium.org TBR=ben Review URL: https://codereview.chromium.org/66823004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234108 0039d316-1c4b-4281-b951-d872f2087c98
* alternate ntp: fix missing recent tabs on first open of wrench menukuan@chromium.org2013-10-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause: TabRestoreService::LoadTabsFromLastSession is async, so tabs from last session are not shown on first open of wrench menu. fix: reimpl recent tabs submenu as a dynamic model and menu. * MenuModelDelegate - add API to handle dynamic MenuModel, so that changes in model can be communicated to the visual menu * reimpl RecentTabsSubMenuModel - observe TabRestoreService so that model and menu can be modified after tabs from last session are loaded and when tabs change in current session. - split tabs up into local (recently closed) tabs and foreign (other devices) tabs - when TabRestoreService notifies, delete all local tabs/windows and re-create them, then notify MenuModelDelegate of change. * RecentTabsMenuModelDelegate - handle dynamic changes from RecentTabsSubMenuModel to delete and recreate menu items and command_id-to-model/index mappings * WrenchMenu - allow adding of menu item at specified index * add new test for dynamic model BUG=256750 TEST=verify per bug rpt Review URL: https://codereview.chromium.org/26012002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228249 0039d316-1c4b-4281-b951-d872f2087c98
* Add ComboboxModel::IsItemEnabledAthajimehoshi@chromium.org2013-10-082-0/+7
| | | | | | | | | | | | This CL enables to switch the enabling/disabling state of menu item of a Combobox. Concretely, this feature is needed by new Translate UI. Actually, the Translate current infobar has this feature. For example, the Translate UI has the source language and the target language selectors as Comboboxes, and when English is selected as the source language, English in the target language selector should be disabled. BUG=276181 Review URL: https://codereview.chromium.org/26219002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227476 0039d316-1c4b-4281-b951-d872f2087c98
* Adds ComboboxModelObserver to ComboboxModelsky@chromium.org2013-10-012-0/+31
| | | | | | | | | | | | | I'm going to need this so that I can make RecentlyUsedFoldersComboModel notify observers when it changes. BUG=294330 TEST=none R=msw@chromium.org Review URL: https://codereview.chromium.org/25146009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226304 0039d316-1c4b-4281-b951-d872f2087c98
* enhance MenuItemView, MenuModelAdapter and SimpleMenuModel for dynamic model ↵kuan@chromium.org2013-10-012-0/+8
| | | | | | | | | | | | | | | | and menu this is in preparation for dynamic model and menu for recent tabs submenu: - move model-specific method from MenuItemView to MenuModelAdapter - add method to MenuModelAdapter to add menu item at specific index from model - add RemoveItemAt to SimpleMenuModel BUG=256750 TEST=nothing yet. Review URL: https://codereview.chromium.org/25174004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226096 0039d316-1c4b-4281-b951-d872f2087c98
* Do not call OnModelChanged in TaskManagerTableModel::OnItemsRemoved.msw@chromium.org2013-09-111-1/+1
| | | | | | | | | | | | | | | | | Remove the OnModelChanged() call from OnItemsRemoved. (it silently stomps the selection and isn't needed) Remove the comment regarding a similar call for OnItemsAdded. (irrelevant, since we no longer use the Win control) Fix the comment for ListSelectionModel::DecrementFrom. BUG=257319 TEST=Win/CrOS Task Managers update the selection and button state reasonably after clicking "End Process". R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/23534056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222515 0039d316-1c4b-4281-b951-d872f2087c98
* Add a minor text member to ui::MenuModel.calamity@chromium.org2013-09-044-31/+60
| | | | | | | | | | | | | | | | | The menu model currently has a |sublabel| member which is does not match the documentation. This CL implements the documented behavior for |sublabel| and migrates the previous functionality into a new member |minor_text|. The new sublabel functionality is required for the app list profile selector in https://chromiumcodereview.appspot.com/20656002/. BUG=254143 TEST=No functional changes. Review URL: https://chromiumcodereview.appspot.com/23536002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221131 0039d316-1c4b-4281-b951-d872f2087c98
* Update Status Icon menu when menu model changes (Linux Aura)sidharthms@chromium.org2013-08-282-0/+16
| | | | | | | | | | | | Status icon context menus currently do not update themselves when the menu model changes or when the check state of a menu item changes. This patch fixes that behavior. BUG=263926,262395 Review URL: https://chromiumcodereview.appspot.com/20728003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219964 0039d316-1c4b-4281-b951-d872f2087c98
* Make 'Submit' button blue for payments dialog.estade@chromium.org2013-07-231-0/+4
| | | | | | | | | | | This also does some rewiring under the hood so that the 'Continue' button at the end of autocheckout is actually an OK button and not a CANCEL button (this should not lead to any user-visible change). BUG=261669 R=ahutter@chromium.org, msw@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/19705008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213017 0039d316-1c4b-4281-b951-d872f2087c98
* Replace third_party/icu/public with third_party/icu/source in the include ↵jshin@chromium.org2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | directives. This is to move back icu headers in third_party/icu/public/{i18n,common}/unicode back to their upstream locations in third_party/icu/source/{i18n,common}/unicode. http://codereview.chromium.org/18836004 has is a CL to move ICU header files. Roll ICU to the version with the above ICU CL (http://crrev.com/211851 ). In addition to the global replacement of third_party/icu/public with third_party/icu/source, the top-level DEPS, DEPS in printing and chrome/ are tightened up. (the latter two were too permissive (it used to allow any header from third_party/icu). Besides, sync '-foo' list in ios/public/DEPS with '+foo' in the top-level DEPS and build/linux/unbundled/icu.gyp is updated. BUG=251433 TEST=Compile succeeds on all bots. checkdeps.py does not find any error. TBR=brettw,sky,wtc Review URL: https://chromiumcodereview.appspot.com/18252003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212324 0039d316-1c4b-4281-b951-d872f2087c98
* Use a direct include of the message_loop header in ui/, part 1.avi@chromium.org2013-07-181-1/+1
| | | | | | | | | | BUG=260807 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/19629002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212243 0039d316-1c4b-4281-b951-d872f2087c98
* [Cleanup] Remove an API that's never called.groby@chromium.org2013-07-171-3/+0
| | | | | | | | | | TBR=sky@chromium.org R=ben@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/18462003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211942 0039d316-1c4b-4281-b951-d872f2087c98
* ui/base/models: Use base::string16 now that string16 was moved into base ↵tfarina@chromium.org2013-06-2013-82/+100
| | | | | | | | | | | | | namespace. base/string16.h was moved into base namespace in r191198 by Brett. BUG=None TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/17443002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207419 0039d316-1c4b-4281-b951-d872f2087c98
* Use a direct include of strings headers in ui/, part 2.avi@chromium.org2013-06-1110-11/+11
| | | | | | | | | | BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16431009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205608 0039d316-1c4b-4281-b951-d872f2087c98
* BookmarkModel changes for multiple level undo and redo of bookmarks.tom.cassiotis@gmail.com2013-06-101-0/+8
| | | | | | | | | | | | | | | | Staged commit of a larger feature to ease review and landing the change. - New BookmarkModelObserver entries to be alerted before an action is executed. - BookmarkModel ability to explicitly reorder all children of a bookmark tree. Support function also added to TreeNode for this operation. - Test updated BookmarkModel and BookmarkModelObserver changes. BUG=126092 Review URL: https://chromiumcodereview.appspot.com/16479003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205228 0039d316-1c4b-4281-b951-d872f2087c98
* Use a direct include of utf_string_conversions.h in ui/.avi@chromium.org2013-06-071-1/+1
| | | | | | | | | | BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16175008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204885 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Refactor views::DialogDelegate to create a ui::DialogModel.sadrul@chromium.org2013-05-142-0/+63
| | | | | | | | | BUG=none R=ben@chromium.org Review URL: https://codereview.chromium.org/15150002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199916 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Use base::MessageLoop.xhwang@chromium.org2013-04-291-1/+1
| | | | | | | | | BUG=236029 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/14061025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197100 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Remove usage of ALLOW_THIS_IN_INITIALIZER_LIST macro.tfarina@chromium.org2013-04-241-1/+1
| | | | | | | | | | | | | | See discussion in chromium-dev mailing list: https://groups.google.com/a/chromium.org/forum/?fromgroups#!topic/chromium-dev/2EdybzAxSu8 The consensul was to remove it as it hasn't been providing us much value. BUG=234765 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/14271017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196051 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring: Moved the function CompareString16WithCollator from ↵hajimehoshi@chromium.org2013-04-231-2/+2
| | | | | | | | | | | ui/base/l10n to base/i18n. The function LocalAwareCompareFilenames at base/i18n/file_util_icu.cc needed a function to sort string with consideration of a locale, but it couldn't refer ui/base. BUG=55883 (Indirectly) TEST=Unit tests Review URL: https://chromiumcodereview.appspot.com/14044002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195711 0039d316-1c4b-4281-b951-d872f2087c98
* add separators to ui::ComboboxModel, implement on views.estade@chromium.org2013-03-262-0/+8
| | | | | | | | | | | also use a separator in the country combobox model. BUG=179496 Review URL: https://chromiumcodereview.appspot.com/12521023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190766 0039d316-1c4b-4281-b951-d872f2087c98
* Add 2-lines summary to CC/Address for Wallet items.aruslan@chromium.org2013-03-154-29/+66
| | | | | | | | | | | This adds functionality, not the final formatting of CC and Address data. BUG=181286 Review URL: https://chromiumcodereview.appspot.com/12755019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188329 0039d316-1c4b-4281-b951-d872f2087c98
* Delete items of the launcher jump list upon pressing Shift clickskuhne@chromium.org2013-03-134-9/+8
| | | | | | | | | | BUG=181541 TEST=unittest Review URL: https://chromiumcodereview.appspot.com/12518012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187769 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Use cross-platform BMB context menu model.asvitkine@chromium.org2013-03-081-2/+1
| | | | | | | | | | | | | XIB Changes: Deleted the BMB context menu entries in BookmarkBar.xib and BookmarkBarFolderWindow.xib. BUG=181034 TEST=BMB context menus behave exactly as before. TBR=sky Review URL: https://chromiumcodereview.appspot.com/12389060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187069 0039d316-1c4b-4281-b951-d872f2087c98
* Add GetDefaultIndex() to ComboboxModel.estade@chromium.org2013-02-262-1/+19
| | | | | | | | BUG=none Review URL: https://codereview.chromium.org/12335026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184532 0039d316-1c4b-4281-b951-d872f2087c98
* Only add NORMAL separators if menu has at least one item and previous item ↵wez@chromium.org2013-02-082-18/+33
| | | | | | | | | | | | | is not a separator and add RemoveTrailingSeparators. This CL also cleans up separator logic in several of the derived menu model builder classes. BUG=158195 TEST=Menus should have separators placed as they did before, and no menu should have a separator at the top, or two adjacent separators anywhere within it. Review URL: https://chromiumcodereview.appspot.com/12094009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181478 0039d316-1c4b-4281-b951-d872f2087c98
* Nukes MenuModel::GetFirstItemIndex. It is only needed for windows, sosky@chromium.org2013-01-182-18/+6
| | | | | | | | | | | | | | I pushed the code there. Additionally the places that tested this or tried to implement it did so incorrectly. BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/12025003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177763 0039d316-1c4b-4281-b951-d872f2087c98
* Removes SimpleMenuModel::FlipIndex. It was only used bysky@chromium.org2013-01-093-25/+13
| | | | | | | | | | | | | | | | SystemMenuModel. I've made it so SystemMenuModel doesn't need it. This is a precursor to sharing system menu building code among the frame types. BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11791039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175643 0039d316-1c4b-4281-b951-d872f2087c98
* Roll ICU and convert include style to standard Chromium style,phajdan.jr@chromium.org2013-01-071-1/+1
| | | | | | | | | | i.e. third_party/... BUG=165264 Review URL: https://codereview.chromium.org/11734021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175399 0039d316-1c4b-4281-b951-d872f2087c98
* Moves TabStripSelectionModel to ui/base/models and renamessky@chromium.org2012-12-213-0/+466
| | | | | | | | | | | | | | | ListSelectionModel. I plan on using it in TableView. I would have liked to rename to SelectionModel, but there is already such a class in ui/gfx. BUG=none TEST=none R=sadrul@chromium.org TBR=aa@chromium.org, avi@chromium.org Review URL: https://chromiumcodereview.appspot.com/11618047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174350 0039d316-1c4b-4281-b951-d872f2087c98
* Cleans up the set of TableColumn constructors.sky@chromium.org2012-12-132-46/+1
| | | | | | | | | | | BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11550032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173006 0039d316-1c4b-4281-b951-d872f2087c98
* Remove separator from top of Apps v2 context menus.wez@chromium.org2012-12-132-0/+10
| | | | | | | | | | | | | - Adds AddSeparatorIfNecessary to SimpleMenuModel. - Adds DCHECK for duplicate separators in SimpleMenuModel::AddSeparator. - Updates app-list and launcher to use AddSeparatorIfNecessary. BUG=158195 Review URL: https://chromiumcodereview.appspot.com/11558008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172731 0039d316-1c4b-4281-b951-d872f2087c98
* Alternate NTP: Update recent tabs fav iconssail@chromium.org2012-11-193-2/+8
| | | | | | | | | | | | | | | | | This CL is the Mac version of this change: https://chromiumcodereview.appspot.com/11298004/diff/13039/chrome/browser/ui/views/wrench_menu.cc It adds a MenuModelDelegate that updates the menu's icons when the recent tab fav icons change. (Note, the the Mac wrench menu isn't really testable right now. I'm planning to extend testing in a separate CL). Screenshot: http://i.imgur.com/lLs1q.png BUG=160844 Review URL: https://chromiumcodereview.appspot.com/11417039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168602 0039d316-1c4b-4281-b951-d872f2087c98
* Remaining bits of getting menus to look correct depending uponsky@chromium.org2012-11-061-0/+3
| | | | | | | | | | | | | | environment. Theres a bit of cruft here, I'm hoping that'll be cleaned up once we standardize on the one true menu. BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11363092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166266 0039d316-1c4b-4281-b951-d872f2087c98
* ui/base/models: Some fixes to the TreeNodeIterator unittest.tfarina@chromium.org2012-10-122-42/+47
| | | | | | | | | TEST=ui_unittests --gtest_filter=TreeNodeIteratorTest* R=sky@chromium.org Review URL: https://codereview.chromium.org/11066064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161564 0039d316-1c4b-4281-b951-d872f2087c98
* Add a ListModel::Move.xiyuan@chromium.org2012-09-253-10/+60
| | | | | | | | | | | | | | It will be used for app list drag-n-drop reodering. BUG=117090 TEST=ListModelTest.* should pass. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10956052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158469 0039d316-1c4b-4281-b951-d872f2087c98
* The touch menu for ChromeOS will be used for all flavors of ChromeOS while ↵skuhne@chromium.org2012-08-244-17/+62
| | | | | | | | | | | | | | | | other operating systems should stay as they are. Furthermore changed according to specifications which can be seen in the issue. Cleaned up the menu separator constants. BUG=137345 TEST=visually checked Review URL: https://chromiumcodereview.appspot.com/10837317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153157 0039d316-1c4b-4281-b951-d872f2087c98
* Convert ui::MenuModel to use gfx::Image instead of ImageSkia.rsesek@chromium.org2012-08-223-24/+24
| | | | | | | | | BUG=58030 TEST=none Review URL: https://chromiumcodereview.appspot.com/10824402 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152767 0039d316-1c4b-4281-b951-d872f2087c98
* base: Make ScopedVector::clear() destroy elements.derat@chromium.org2012-07-192-2/+2
| | | | | | | | | | | | | | | | | | | This makes ScopedVector's clear() method destroy the elements before clearing the internal vector, matching the behavior of the erase() method. I'm moving clear()'s previous element-preserving behavior into a new weak_clear() method, matching weak_erase(). I'm also removing ScopedVector::reset(), as it duplicated clear()'s new behavior and isn't a part of std::vector. BUG=137909 TEST=added Review URL: https://chromiumcodereview.appspot.com/10797017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147360 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the rest of #pragma once in one big CL.ajwong@chromium.org2012-07-1112-12/+0
| | | | | | | | | For context see this thread: https://groups.google.com/a/chromium.org/forum/?fromgroups#!topic/chromium-dev/RMcVNGjB4II TBR=thakis,pkasting,jam git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146163 0039d316-1c4b-4281-b951-d872f2087c98
* base: Remove dereference structure operator (i.e ->) from ScopedVector.tfarina@chromium.org2012-06-302-16/+15
| | | | | | | | | BUG=128663 R=brettw@chromium.org,willchan@chromium.org Review URL: https://chromiumcodereview.appspot.com/10669038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145073 0039d316-1c4b-4281-b951-d872f2087c98
* app_list/chromeos: Fix wrong app icon in search results.xiyuan@chromium.org2012-06-131-3/+2
| | | | | | | | | | | | | | | - Use match type to find extension app result; - Load app icon using ImageLoadingTracker; - Add a SearchResultObserver; - SearchResultView implements SearchResultObserver to update when extension app icon is loaded; BUG=132361 TEST=Verify extension app icon shows up correctly in search results. Review URL: https://chromiumcodereview.appspot.com/10544116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141865 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove vector::at() calls in SimpleMenuModel. Do CHECKs instead.thestig@chromium.org2012-06-022-14/+21
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10458045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140139 0039d316-1c4b-4281-b951-d872f2087c98
* ui/base/models: Modernize TreeNodeModel unittests.tfarina@chromium.org2012-05-311-20/+16
| | | | | | | | | TEST=ui_unittests --gtest_filter=TreeNodeModelTest* R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10446050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139791 0039d316-1c4b-4281-b951-d872f2087c98
* Converts ui/views/controls, ui/views/examples, ui/base/models to use ↵pkotwicz@chromium.org2012-05-246-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gfx::ImageSkia Converts all instances using an SkBitmap to use a gfx::ImageSkia instead Replaces method names, variables and comments which include "bitmap" to use "image" instead Sed script used for conversion: 1 # Modify comments. 2 /\/\// { 3 # Save line in hold buffer. 4 h 5 # Extract portion of line which represents comment 6 # and put that into pattern space. 7 s|.*//\(.*\)|\1| 8 # Perform changes. 9 s| SkBitmap| ImageSkia|g 10 s| a bitmap| an image|g 11 s| Bitmap| Image|g 12 s| bitmap| image|g 13 # Append hold buffer to pattern space, 14 G 15 # Put everything back together. 16 s|\(.*\)\n\(.*\)//.*|\2//\1| 17 } 18 19 # Modify code. 20 # 21 # Store in hold buffer [code part ]//[comment part(including //)]. 22 # Thus you would get 4 consecutive slashes if the line actually does 23 # have a comment. 24 # Extract portion of line which has code and put that into pattern space. 25 26 # Line has a comment. 27 /\/\// { 28 s|\(.*\)//\(.*\)|\1////\2| 29 h 30 s|\(.*\)//.*|\1| 31 } 32 # No comment on line 33 /\/\// !{ 34 s|\(.*\)|\1//| 35 h 36 s|\(.*\)//|\1| 37 } 38 39 # Perform Changes 40 41 # Delete calls. 42 /buildMipMap(false)/d 43 # Replace includes. 44 s|third_party/skia/include/core/SkBitmap\.h|ui/gfx/image/image_skia\.h|g 45 s|ToSkBitmap|ToImageSkia|g 46 s|GetBitmapNamed|GetImageSkiaNamed|g 47 # Rename variables of type SkBitmap to variables of type gfx::ImageSkia 48 # Try to avoid renaming function names and classes which have 'SkBitmap' 49 # in them. 50 s|SkBitmap\([ (*&>),]\)|gfx::ImageSkia\1|g 51 # Modify variable names. 52 s|_bitmap|_image|g 53 s|bitmap|image_skia|g 54 s|bmp|image_skia|g 55 # Rename functions and classes which have 'SkBitmap' in them to use 'ImageSkia' instead 56 s|SkBitmap|ImageSkia|g 57 s|Bitmap|Image|g 58 # Restore things we didn't mean to change. 59 # SkImageOperations 60 s|ImageSkiaOperations|SkBitmapOperations|g 61 s|SkBitmapOperations::Create\(.*\)Image(|SkBitmapOperations::Create\1Bitmap(|g 62 s|skimage_skia_operations|skbitmap_operations|g 63 # SkPaint 64 s|setFilterImage|setFilterBitmap|g 65 s|isFilterImage|isFilterBitmap|g 66 # gfx::Canvas 67 s|ExtractImage|ExtractBitmap|g 68 # We will want to rename this function after everything else has changed. 69 s|DrawImageInt|DrawBitmapInt|g 70 71 # Append hold buffer to pattern space. 72 # Pattern space will look like: [code part]\n[code part]//[comment part (includi ng //). 73 G 74 # Put everything back together. 75 s|\(.*\)\n\(.*\)//\(.*\)|\1\3| I modified the following files manually afterwards: 1 ash/wm/workspace/frame_maximize_button.cc 2 ash/wm/workspace/frame_maximize_button.h 3 chrome/browser/chromeos/login/helper.cc 4 chrome/browser/chromeos/status/network_menu.cc 5 chrome/browser/cookies_tree_model.cc 6 chrome/browser/cookies_tree_model.h 7 chrome/browser/ui/gtk/gtk_tree.cc 8 chrome/browser/ui/gtk/menu_gtk.cc 9 chrome/browser/ui/search_engines/template_url_table_model.cc 10 chrome/browser/ui/search_engines/template_url_table_model.h 11 chrome/browser/ui/toolbar/back_forward_menu_model.cc 12 chrome/browser/ui/toolbar/back_forward_menu_model.h 13 chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc 14 chrome/browser/ui/toolbar/wrench_menu_model.cc 15 chrome/browser/ui/toolbar/wrench_menu_model.h 16 chrome/browser/ui/views/hung_renderer_view.cc 17 chrome/browser/ui/views/infobars/infobar_button_border.cc 18 chrome/browser/ui/views/infobars/infobar_view.cc 19 chrome/browser/ui/views/task_manager_view.cc 20 chrome/browser/ui/views/web_intent_picker_views.cc 21 chrome/browser/ui/views/wrench_menu.cc 22 chrome/browser/ui/webui/chromeos/login/network_dropdown.cc 23 ui/views/controls/button/image_button.cc 24 ui/views/controls/button/image_button_unittest.cc 25 ui/views/controls/image_view.cc 26 ui/views/controls/image_view.h 27 ui/views/controls/scrollbar/bitmap_scroll_bar.cc 28 ui/views/controls/scrollbar/bitmap_scroll_bar.h 29 ui/views/controls/scrollbar/scroll_bar.h 30 ui/views/controls/table/table_view_win.cc 31 ui/views/controls/tree/tree_view_views.h 32 ui/views/controls/tree/tree_view_win.cc 33 ui/views/examples/table_example.cc 34 ui/views/view_unittest.cc Whitespace changes and changes in includes in: 1 ui/base/models/menu_model.h 2 ui/base/models/table_model.h 3 ui/base/models/tree_model.h 4 ui/views/controls/glow_hover_controller.h 5 ui/views/controls/menu/menu.h 6 ui/views/controls/menu/menu_config_views.cc 7 ui/views/controls/menu/native_menu_win.cc 8 ui/views/controls/message_box_view.h 9 ui/views/controls/table/table_view_views.cc 10 ui/views/controls/throbber.h 11 ui/views/examples/table_example.h TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10437006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138800 0039d316-1c4b-4281-b951-d872f2087c98
* ui/base/models: Remove unnecessary virtuals from ListModel functions.tfarina@chromium.org2012-05-201-11/+11
| | | | | | | | | | | | | ListModel is intended to be used as composition not inheritance, so it's unlikely these functions will be needed to be overridden, and they aren't until now, so let's not make them virtual for now. R=xiyuan@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10332264 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138062 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Change ListModel to operate in size_t instead of int.tfarina@chromium.org2012-05-183-29/+31
| | | | | | | | | R=xiyuan@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10408009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137862 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove unneeded scoped_ptr.h includes from ash, base, media, and ui.thestig@chromium.org2012-05-161-2/+1
| | | | | | | | | | BUG=none TEST=none TBR=ben,brettw,hclam Review URL: https://chromiumcodereview.appspot.com/10391121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137375 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Do not expose the underline type (vector) used in ListModel.tfarina@chromium.org2012-05-152-14/+11
| | | | | | | | | | | | | And while I'm here rename item_at to GetItemAt. I think this is more consistent with AddAt, DeleteAt, etc. TEST=ui_unittests --gtest_filter=ListModel* R=xiyuan@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10386118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137112 0039d316-1c4b-4281-b951-d872f2087c98
* ui/base/models: Make ComboboxModel::GetItemCount() a constant function.tfarina@chromium.org2012-03-271-1/+1
| | | | | | | | | | R=sky@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128961 Review URL: https://chromiumcodereview.appspot.com/9838092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129071 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-12 06:44:36 +0000