summaryrefslogtreecommitdiffstats
path: root/chrome/browser/icon_loader_linux.cc
Commit message (Collapse)AuthorAgeFilesLines
* Move ReadFileToString to the base namespace.brettw@chromium.org2013-08-301-1/+1
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/19579005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220612 0039d316-1c4b-4281-b951-d872f2087c98
* Use a direct include of the message_loop header in chrome/browser/, part 7.avi@chromium.org2013-07-181-1/+1
| | | | | | | | | | BUG=260807 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/19602003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212332 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of last call to content::DecodeImage from chrome/browser. Per ↵jam@chromium.org2013-07-161-8/+9
| | | | | | | | | | | http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html, icons on Linux are one of png, xpm, or svg. We didn't support svg already. WebKit image decoding doesn't support xpm, so we can just call out to the png decoder directly. BUG=237249 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/19276002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211870 0039d316-1c4b-4281-b951-d872f2087c98
* Move image_decoder.cc/.h from webkit\glue to content\child.ananta@chromium.org2013-06-261-3/+4
| | | | | | | | | | | | | | | | | This also brings in a new content API DecodeImage which is declared in content\public\child\image_decoder_utils.h. Used by chrome\browser code which runs mostly in the utilty process to decode icons. We still have issues with single process mode which results in chrome\browser depending on content_child. This will be addressed in a subsequent change. This is continuation of the ongoing work for bug https://code.google.com/p/chromium/issues/detail?can=2&q=237249 which is to split chrome.dll into a browser and a renderer/child component due to build issues on Windows. To achieve this we need to ensure that the browser code does not depend on webkit. This mostly comes through webkit\glue. BUG=237249 R=jam@chromium.org, jamesr@chromium.org Review URL: https://codereview.chromium.org/17704002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208736 0039d316-1c4b-4281-b951-d872f2087c98
* Skip the cached icons if the icon can change (ie. exe/dll/ico on Windows).simonhatch@chromium.org2013-04-091-0/+4
| | | | | | | | BUG=226918 Review URL: https://chromiumcodereview.appspot.com/13812014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193259 0039d316-1c4b-4281-b951-d872f2087c98
* Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.ccsimonhatch@chromium.org2013-04-031-0/+6
| | | | | | | | | | | | | | | Changed cache to map file paths to icons rather than by group id. Renamed GetGroupIDFromFilepath to reflect that it can potentially do file io. BUG=72740 TEST=Bring up downloads ui on linux and file icons still show up. R=rdsmith@chromium.org Review URL: https://chromiumcodereview.appspot.com/12211049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192143 0039d316-1c4b-4281-b951-d872f2087c98
* Merge branch 'master' into file_path_browserbrettw@chromium.org2013-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version control markers Merge branch 'master' into file_path_browser remove version control Fix typo Merge branch 'master' into file_path_browser Conflicts: chrome/browser/intents/native_services_browsertest.cc chrome/browser/ui/intents/native_file_picker_service.cc Merge branch 'master' into file_path_browser Conflicts: chrome/browser/chromeos/drive/drive_file_system.cc chrome/browser/chromeos/drive/drive_file_system.h chrome/browser/chromeos/drive/drive_file_system_interface.h chrome/browser/chromeos/drive/drive_file_system_unittest.cc chrome/browser/chromeos/drive/file_system/drive_operations.cc chrome/browser/chromeos/login/wallpaper_manager.cc chrome/browser/chromeos/login/wallpaper_manager.h chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc chrome/browser/google_apis/gdata_wapi_operations.cc chrome/browser/google_apis/gdata_wapi_operations.h chrome/browser/google_apis/gdata_wapi_operations_unittest.cc chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.h chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.h chrome/browser/profiles/profile_impl_io_data.cc chrome/browser/profiles/profile_impl_io_data.h chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc chrome/browser/ui/webui/options/manage_profile_handler.cc Long lines long lines some long lines. long lines long lines Beginning of lines. Rename FilePath -> base::FilePath in chrome/browser git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
* Convert gfx::Image::Image(const SkBitmap&) and ↵pkotwicz@chromium.org2013-01-231-1/+1
| | | | | | | | | | gfx::ImageSkia::ImageSkia(const SkBitmap&) to gfx::Image::CreateFrom1xBitmap(const SkBitmap&) and gfx::ImageSkia::CreateFrom1xBitmap(const SkBitmap&) respectively Hopefully these changes will make the constructors / factory methods less confusing and prevent bugs as a result of confusion about what the constructors do. Review URL: https://chromiumcodereview.appspot.com/11970013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178408 0039d316-1c4b-4281-b951-d872f2087c98
* Load 2x resources on demandoshima@chromium.org2012-08-291-1/+4
| | | | | | | | | | | | | | | | | Currently, this always load 1x. This will be fixed in follow up CL to use currently used scale factor. * Added thread check to ImageSkiaStorage using NonThreadSafe. This is important as GetRepresentation may change the stage now even for the Image obtained from ResourceBundle. * Added SetReadOnly to protect read only resources (ones in ResourceBundle) from being modified by accident. * Addded MakeThreadSafe to guarantee that it can be safely accessed from multiple threads. BUG=141351,144367 TEST=covered by tests. Also run with --force-device-scale-factor=2 and --load-2x-resources and make sure chrome still uses 2x resources where available. Review URL: https://chromiumcodereview.appspot.com/10820049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153846 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-151-6/+6
| | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=137075 Review URL: https://chromiumcodereview.appspot.com/10378009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137140 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 137075 - Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-151-6/+6
| | | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10332163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137076 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-151-6/+6
| | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137075 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 137068 - Revert 136812 - Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-151-6/+6
| | | | | | | | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136813 Review URL: https://chromiumcodereview.appspot.com/10383153 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10382166 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137072 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 136812 - Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-151-6/+6
| | | | | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136813 Review URL: https://chromiumcodereview.appspot.com/10383153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137068 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 136823 - Get rid of Image::Image(SkBitmap*); because of win build failuretoyoshim@chromium.org2012-05-141-6/+6
| | | | | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136812 Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10392075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136830 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-141-6/+6
| | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136812 Review URL: https://chromiumcodereview.appspot.com/10378009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136823 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 136812 - Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-141-6/+6
| | | | | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10383153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136813 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of Image::Image(SkBitmap*)pkotwicz@chromium.org2012-05-141-6/+6
| | | | | | | | | Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136812 0039d316-1c4b-4281-b951-d872f2087c98
* Remove some constant spew in unit test logserg@chromium.org2012-04-111-15/+20
| | | | | | | | | | BUG=44565 TEST=none Review URL: http://codereview.chromium.org/9960073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131729 0039d316-1c4b-4281-b951-d872f2087c98
* base::Bind() chrome/browser/icon_loader*.ccrsesek@chromium.org2011-11-151-1/+2
| | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/8523008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110175 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Move base/mime_util* to base/nix. It's not used on any other platform.thestig@chromium.org2011-11-111-2/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/8538008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109685 0039d316-1c4b-4281-b951-d872f2087c98
* aura: Make the Linux version of IconLoader not require GTK+.derat@chromium.org2011-11-101-0/+53
| | | | | | | | | | | | | | | | | | This change makes it use webkit_glue::ImageDecoder instead of gdk-pixbuf and hides various GTK+ theme-related code behind TOOLKIT_USES_GTK ifdefs. Chrome OS is currently loading its own icons from resources (see r86936 and http://crosbug.com/129) instead of using IconLoader and IconManager, so this only removes NOTIMPLEMENTED()s on non-Chrome-OS Linux Aura builds (along with simplifying the GTK+ version of the code). BUG=99494 TEST=manual: download icons are still visible on a gtk+ build Review URL: http://codereview.chromium.org/8501030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109527 0039d316-1c4b-4281-b951-d872f2087c98
* + Renaming some _linux.cc files as _gtk.cc since that is what they really are.saintlou@chromium.org2011-09-231-71/+0
| | | | | | | | | | | | | + Adding _aura.cc stub files. + Fixing a few #ifdef for USE_AURA build. + Adding SkRegion as NativeRegion under Aura & adding ScopedRegion under ui/gfx. BUG=97131 TEST=none Review URL: http://codereview.chromium.org/7970025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102564 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Fix icons in download dom UIsail@chromium.org2011-06-081-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | Icons in the download DOM UI were very fuzzy. This was a regression due to r76743. The problem was that IconLoad was returning a multi-resolution image but callers weren't multi-resolution aware. For example, the download DOM UI would encode the image to PNG but it would just pick the first bitmap which happened to be 16x16. This caused icons in the DOM UI to look fuzzy. I think there are two fixes for this: 1. Change IconLoader so that callers no longer specify the icon size. Instead, callers must pick the right resolution when they get the icon loaded callback. 2. Have callers specify that they want all resolutions. I went with 2 because always loading all icon sizes can be expensive. BUG=84741 TEST=Ran and verified that the downloads UI looks good. Review URL: http://codereview.chromium.org/6995068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88406 0039d316-1c4b-4281-b951-d872f2087c98
* Convert IconLoader and IconManager to deal with gfx::Image rather than SkBitmap.rsesek@chromium.org2011-03-031-25/+7
| | | | | | | | | | | | | | This allows loading of icons in the platform format, avoiding unnecessary conversions if the image is going to be used with the platform toolkit. In other cases, this just pushes image conversion to the callsite rather than the actual image load. BUG=19685 TEST=unit_tests and visual inspection of icons in the download shelf Review URL: http://codereview.chromium.org/6597043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76743 0039d316-1c4b-4281-b951-d872f2087c98
* Change includes of gfx/* to ui/gfx/*sail@chromium.org2011-02-051-2/+2
| | | | | | | | | BUG=71063 TEST=compiled Review URL: http://codereview.chromium.org/6312156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98
* Move base/thread.h to base/threading, fix up callers to use the new location.brettw@chromium.org2011-01-011-1/+1
| | | | | | | | TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
* Convert IconLoader to use gfx::ScopedImage<> and other hygiene fixes.rsesek@chromium.org2010-10-291-3/+3
| | | | | | | | | BUG=none TEST=compile/automated tests Review URL: http://codereview.chromium.org/4121008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64419 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove base/gtk_util.h by moving its methods tojhawkins@chromium.org2010-10-291-2/+2
| | | | | | | | | | | gfx/gtk_util.h BUG=none TEST=none Review URL: http://codereview.chromium.org/4150006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64348 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Get rid of app/gtk_util.h.jhawkins@chromium.org2010-10-281-1/+1
| | | | | | | | | | | | | * Most functions moved to chrome/browser/gtk/gtk_util.h because they're only used within chrome/browser. * BGRAToRGBA() is used within chrome/ and app/ so moved it to base/gtk_util.h. BUG=none TEST=none Review URL: http://codereview.chromium.org/4170002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64295 0039d316-1c4b-4281-b951-d872f2087c98
* Move non-linux specific code from base/linux_util to app/gtk_utilpvalchev@google.com2010-05-131-2/+3
| | | | | | | | from sprewell Review URL: http://codereview.chromium.org/2058004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47201 0039d316-1c4b-4281-b951-d872f2087c98
* Move image codec stuff to toplevel gfx.ben@chromium.org2010-03-181-1/+1
| | | | | | | | | TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41911 0039d316-1c4b-4281-b951-d872f2087c98
* Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classesbrettw@chromium.org2009-10-031-3/+3
| | | | | | | | | | | | | | | into the gfx namespace. Combine the PNGEncoder and PNGDecoder. There were separate when we had different executables for the browser and renderer, and linked the encoder only in one of them (which saved us some space used by libpng). This hasn't been the case for years, so combining them (again) makes sense. TEST=none BUG=none Review URL: http://codereview.chromium.org/243076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27930 0039d316-1c4b-4281-b951-d872f2087c98
* Enable SVG icons for linux.estade@chromium.org2009-07-241-2/+1
| | | | | | | | | | | get rid of kEnableSVG BUG=12272 TEST=I made it load an svg for the download shelf and it worked. SVGZ did not work. Review URL: http://codereview.chromium.org/159247 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21481 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Move icon parsing to UI thread.estade@chromium.org2009-07-161-14/+38
| | | | | | | | | | | | | Loading the data from disk remains on the background thread. This fix is pseudo-speculative. BUG=14746,14745,15244,15416 TEST=UI tests stop flaking out. Review URL: http://codereview.chromium.org/149764 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20888 0039d316-1c4b-4281-b951-d872f2087c98
* linux: Load icons with gdk instead of using PNGDecoder.estade@chromium.org2009-06-191-13/+28
| | | | | | | | BUG=14487 Review URL: http://codereview.chromium.org/131058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18779 0039d316-1c4b-4281-b951-d872f2087c98
* Linux download shelf icons first cut.estade@chromium.org2009-05-201-1/+28
| | | | | | | | | Nor do we have support for alternate file formats; nor do we have a default icon. BUG=http://crbug.com/8631 Review URL: http://codereview.chromium.org/113571 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16444 0039d316-1c4b-4281-b951-d872f2087c98
* Stub implementation of linux, mac icon loader/manager.estade@chromium.org2009-05-081-0/+15
Define a platform specific type IconGroupID which helps with caching multiple requests for the same icon. Previously we just used the file path (or the extension), but on POSIX we use mime types rather than extensions. Review URL: http://codereview.chromium.org/113120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15665 0039d316-1c4b-4281-b951-d872f2087c98