summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_icon_source_apitest.cc
Commit message (Collapse)AuthorAgeFilesLines
* net: move host_resolver files from net/base to net/dnsphajdan.jr@chromium.org2013-03-211-1/+1
| | | | | | | | BUG=70818 Review URL: https://codereview.chromium.org/12518036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189485 0039d316-1c4b-4281-b951-d872f2087c98
* Merge branch 'master' into file_path_browserbrettw@chromium.org2013-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix crash in ExtensionIconSource when chrome://extension-icon URL is invalid.tbarzic@chromium.org2013-01-301-0/+15
| | | | | | | | | | | | | | The problem is SendDefaultResponse gets the callback it calls from resquest_map_, but in the case the request is not valid, the request data doesn't get added to the map. BUG=172696 TEST=navigtate to chrome://extension-icon/xxx ; no crash Review URL: https://chromiumcodereview.appspot.com/12095021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179508 0039d316-1c4b-4281-b951-d872f2087c98
* Remove TabStripModel wrapper use.avi@chromium.org2013-01-291-5/+5
| | | | | | | | | | BUG=167548 TEST=no functional change Review URL: https://chromiumcodereview.appspot.com/12066003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179254 0039d316-1c4b-4281-b951-d872f2087c98
* Simplify ExecuteJavaScript* functions.darin@chromium.org2013-01-041-12/+8
| | | | | | | | | | | | | | | | | | | | Remove the "Java" and rename to ExecuteScript*. This better matches conventions elsewhere in the codebase. Introduce ExecuteScriptInFrame* variants for the less common case where script execution in a subframe is desired. Make it possible to pass the ExecuteScript* family of functions either a WebContents pointer or a RenderViewHost pointer to further simplify callsites. R=jam@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/11753009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175156 0039d316-1c4b-4281-b951-d872f2087c98
* Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}darin@chromium.org2013-01-021-8/+12
| | | | | | | | | | | | | to take std::string (UTF-8) instead of std::wstring. This seems to help simplify callsites considerably. TBR=jam@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/11728003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174880 0039d316-1c4b-4281-b951-d872f2087c98
* Move ExecuteJavaScript functions from ui_test_utils.h to ↵jam@chromium.org2012-07-241-4/+5
| | | | | | | | | browser_test_utils.h so they can be reused by content_browsertests. BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10795090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148132 0039d316-1c4b-4281-b951-d872f2087c98
* Remove browser::FindTabbedBrowser from a bunch of browser tests by making ↵jam@chromium.org2012-07-121-4/+1
| | | | | | | | | ui_test_utils::OpenURLOffTheRecord return the Browser. BUG=129187 Review URL: https://chromiumcodereview.appspot.com/10702156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146365 0039d316-1c4b-4281-b951-d872f2087c98
* Move tab functions off Browser into browser_tabstrip and browser_tabrestore.ben@chromium.org2012-06-291-4/+5
| | | | | | | | http://crbug.com/133576 TEST=none Review URL: https://chromiumcodereview.appspot.com/10702029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
* TabContentsWrapper -> TabContents, part 12.avi@chromium.org2012-06-121-4/+4
| | | | | | | | | | | | Extensions. BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10535077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141590 0039d316-1c4b-4281-b951-d872f2087c98
* Moves methods for finding browsers to browser_finder.sky@chromium.org2012-05-161-3/+3
| | | | | | | | | | | BUG=none TEST=none R=ben@chromium.org TBR=tim@chromium.org, davemoore@chromium.org, scottbyer@chromium.org, keybuk@chromium.org Review URL: https://chromiumcodereview.appspot.com/10391158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137511 0039d316-1c4b-4281-b951-d872f2087c98
* Replace most of Browser::GetSelectedTabContents calls into ↵jam@chromium.org2012-01-031-5/+5
| | | | | | | | | | | | Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review. I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type. BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/9015022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
* Rename TabContents::render_view_host() to GetRenderViewHost and put it into ↵jam@chromium.org2011-12-201-4/+4
| | | | | | | | | the WebContents interface. BUG=98716 Review URL: http://codereview.chromium.org/9007026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115200 0039d316-1c4b-4281-b951-d872f2087c98
* Mark a handful of tests as using legacy manifest versions. We could convertabarth@chromium.org2011-12-071-0/+6
| | | | | | | | | | these tests to using manifest_version 2, but it looks like more effort than it's worth. BUG=62897 Review URL: http://codereview.chromium.org/8825015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113466 0039d316-1c4b-4281-b951-d872f2087c98
* Move in_process_browser_test and ui_test_utils to chrome/test/basephajdan.jr@chromium.org2011-07-291-1/+1
| | | | | | | BUG=90905 Review URL: http://codereview.chromium.org/7532034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94720 0039d316-1c4b-4281-b951-d872f2087c98
* Browser::Type cleanup.jianli@chromium.org2011-05-051-3/+2
| | | | | | | | | | BUG=None TEST=Existing tests R=ben@chromium.org,stevenjb@chromium.org,phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/6697032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84303 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Update a bunch of files to the new location of browser_list.h. Part ↵tfarina@chromium.org2011-04-061-1/+1
| | | | | | | | | | | | | 1/3. BUG=None TEST=None R=avi@chromium.org Review URL: http://codereview.chromium.org/6689029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80632 0039d316-1c4b-4281-b951-d872f2087c98
* Make chrome://extension-icon resources available in incognito mode. Fixes an ↵jstritar@chromium.org2011-03-211-0/+37
| | | | | | | | | | | issue that causes the ExtensionManagementTest.Incognito test to be flaky on Windows. BUG=74905, 75748 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78897 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 78554 - Make chrome://extension-icon resources available in incognito ↵jstritar@chromium.org2011-03-171-37/+0
| | | | | | | | | | | | | | | | mode. (Will revert, trying to determine what is causing the test flake.) BUG=74905, 75748 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 TBR=jstritar@chromium.org Review URL: http://codereview.chromium.org/6713007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78575 0039d316-1c4b-4281-b951-d872f2087c98
* Make chrome://extension-icon resources available in incognito mode.jstritar@chromium.org2011-03-171-0/+37
| | | | | | | | | | | (Will revert, trying to determine what is causing the test flake.) BUG=74905, 75748 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78554 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 78364 - Make chrome://extension-icon resources available in incognito ↵jstritar@chromium.org2011-03-161-37/+0
| | | | | | | | | | | | | mode. BUG=74905 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 TBR=jstritar@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78390 0039d316-1c4b-4281-b951-d872f2087c98
* Make chrome://extension-icon resources available in incognito mode.jstritar@chromium.org2011-03-161-0/+37
| | | | | | | | | BUG=74905 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78364 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 77714 - Make chrome://extension-icon resources available in incognito ↵tyoshino@chromium.org2011-03-111-37/+0
| | | | | | | | | | | | | | mode. BUG=74905 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 TBR=jstritar@chromium.org Review URL: http://codereview.chromium.org/6672024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77799 0039d316-1c4b-4281-b951-d872f2087c98
* Make chrome://extension-icon resources available in incognito mode.jstritar@chromium.org2011-03-101-0/+37
| | | | | | | | | BUG=74905 TEST=ExtensionIconSourceTest Review URL: http://codereview.chromium.org/6623057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77714 0039d316-1c4b-4281-b951-d872f2087c98
* Display disabled apps with grayed out images on the NTP. Call the re-enable ↵jstritar@chromium.org2011-03-021-0/+43
logic when the user tries to launch the app. This also adds a chrome://extension-icon endpoint that provides easy access to extension and app icons. BUG=61270 TEST=ExtensionIconSourceTest.IconsLoaded Review URL: http://codereview.chromium.org/6495002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76579 0039d316-1c4b-4281-b951-d872f2087c98