summaryrefslogtreecommitdiffstats
path: root/ash/shelf/overflow_bubble_view.cc
Commit message (Collapse)AuthorAgeFilesLines
* Eliminate ash::internal namespaceoshima@chromium.org2014-04-031-4/+1
| | | | | | | | | | | Plus obvious style nit fixes. BUG=None TBR=sky@chromium.org Review URL: https://codereview.chromium.org/224113005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261522 0039d316-1c4b-4281-b951-d872f2087c98
* Revert of Shelf Cleanup (- binary files) ↵jennyz@chromium.org2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/176883022/) Reason for revert: This cl is breaking the app list launch bubble. see crbug.com/351776. Original issue's description: > Shelf Cleanup (- binary files) > > R=skuhne@chromium.org > TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org > BUG=338429 > > re-landing of > https://codereview.chromium.org/140323010/ hopefully this time with less breaking everything. > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256319 TBR=jamescook@chromium.org,skuhne@chromium.org,harrym@chromium.org NOTREECHECKS=true NOTRY=true BUG=338429 Review URL: https://codereview.chromium.org/198063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256662 0039d316-1c4b-4281-b951-d872f2087c98
* Shelf Cleanup (- binary files)harrym@chromium.org2014-03-111-1/+1
| | | | | | | | | | | | | R=skuhne@chromium.org TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org BUG=338429 re-landing of https://codereview.chromium.org/140323010/ hopefully this time with less breaking everything. Review URL: https://codereview.chromium.org/176883022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256319 0039d316-1c4b-4281-b951-d872f2087c98
* Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1) ↵dgrogan@chromium.org2014-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/140323010/) Reason for revert: Broke Linux ChromiumOS Builder (dbg): http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/45933/steps/compile/logs/stdio FAILED: /b/build/goma/gomacc c++ -MMD -MF obj/ash/system/web_notification/ash.web_notification_tray.o.d .... ../../ash/system/web_notification/web_notification_tray.cc: In constructor 'ash::WebNotificationTray::WebNotificationTray(ash::internal::StatusAreaWidget*)': ../../ash/system/web_notification/web_notification_tray.cc:322:7:error: 'UseAlternateShelfLayout' is not a member of 'ash::switches' ../../ui/message_center/message_center_style.h: At global scope: ../../ui/message_center/message_center_style.h:103:15:error: 'message_center::kButtonSeparatorColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:104:15:error: 'message_center::kHoveredButtonBackgroundColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:111:15:error: 'message_center::kProgressBarBackgroundColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:112:15:error: 'message_center::kProgressBarSliceColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:43:15:error: 'message_center::settings::kEntrySeparatorColor' defined but not used [-Werror=unused-variable] Original issue's description: > Part 1) of cleaning up the code related to the shelf layout, specifically removing all instances of branching related to the 'alternate shelf layout' as this is now the only option. > Removed the about:flags entry relating to alternate shelf layout. > > A patch will follow to simplify the remaining layout code as it is still a bit of a spaghetti like mess. > > R=jamescook@chromium.org, skuhne@chromium.org > TBR=miket@chromium.org > BUG=338429 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254301 TBR=jamescook@chromium.org,skuhne@chromium.org,harrym@chromium.org NOTREECHECKS=true NOTRY=true BUG=338429 Review URL: https://codereview.chromium.org/185143002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254306 0039d316-1c4b-4281-b951-d872f2087c98
* Part 1) of cleaning up the code related to the shelf layout, specifically ↵harrym@chromium.org2014-03-011-1/+1
| | | | | | | | | | | | | | | | removing all instances of branching related to the 'alternate shelf layout' as this is now the only option. Removed the about:flags entry relating to alternate shelf layout. A patch will follow to simplify the remaining layout code as it is still a bit of a spaghetti like mess. R=jamescook@chromium.org, skuhne@chromium.org TBR=miket@chromium.org BUG=338429 Review URL: https://codereview.chromium.org/140323010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254301 0039d316-1c4b-4281-b951-d872f2087c98
* Start the move of launcher_types.h to shelf.tfarina@chromium.org2013-12-271-1/+2
| | | | | | | | | | | | | | I decided to split the constants into its own component to make the transition easier to do and review. BUG=248353 TEST=None, no functional changes R=jamescook@chromium.org,harrym@chromium.org TBR=tapted@chromium.org # for c/b/ui/apps Review URL: https://codereview.chromium.org/97983003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242588 0039d316-1c4b-4281-b951-d872f2087c98
* Rename Launcher to Shelf.tfarina@chromium.org2013-12-191-13/+10
| | | | | | | | | | | | | | | | | | - move launcher* from launcher to shelf. - rename to launcher.* to shelf.* and launcher_unittest.cc to shelf_unittest.cc - rename LauncherTestAPI to ShelfTestAPI. - rename to launcher_test_api.* to shelf_test_api.* BUG=248353 TEST=None, no functional changes R=jamescook@chromium.org,harrym@chromium.org TBR=sky Review URL: https://codereview.chromium.org/115113006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241794 0039d316-1c4b-4281-b951-d872f2087c98
* This CL eliminates the necessity of calling SizeToContents() after calling ↵npentrel@chromium.org2013-11-251-8/+16
| | | | | | | | | | set_anchor_rect(). BUG= Review URL: https://codereview.chromium.org/66253004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237067 0039d316-1c4b-4281-b951-d872f2087c98
* Reland - [ash] Enable dragging an item between shelf and overflow bubblesimonhong@chromium.org2013-11-211-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previous cl (https://codereview.chromium.org/61703002/) was reverted because win8-aura doesn't support multiple display. Description Copied from original cl: This is the first CL to implement drag and drop from overflow bubble to shelf. Currently ripped off item from overflow bubble cannot be dragged into shelf. But, Item should be dragged from overflow bubble to shelf to implement drag & drop. In this CL, re-insert bounds for shelf/overflow bubble is re-defined like below. - shelf -bounds that include visible items. - overflow bubble - overflow bubble bounds. * The method of ripping off is not changed (dragging an item to above only in bottom alignment) If ripping off is possible by dragging to down side, it could cause flickering because overflow bubble and shelf is located too closely. R=jamescook@chromium.org BUG=137141 TEST=ash_unittest --gtest_filter=*.CheckDragInsertBoundsWithMultiMonitor Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235935 Review URL: https://codereview.chromium.org/74853002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236504 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 235935 "Reland - [ash] Enable dragging an item between sh..."dcheng@chromium.org2013-11-191-221/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Reland - [ash] Enable dragging an item between shelf and overflow bubble > > Previous cl (https://codereview.chromium.org/61703002/) was reverted > because win8-aura doesn't support multiple display. > > Description Copied from original cl: > This is the first CL to implement drag and drop from overflow bubble to shelf. > > Currently ripped off item from overflow bubble cannot be dragged into shelf. > But, Item should be dragged from overflow bubble to shelf to implement drag & drop. > In this CL, re-insert bounds for shelf/overflow bubble is re-defined like below. > - shelf -bounds that include visible items. > - overflow bubble - overflow bubble bounds. > > * The method of ripping off is not changed (dragging an item to above only in bottom alignment) > If ripping off is possible by dragging to down side, it could cause flickering because overflow bubble and shelf is located too closely. > > R=jamescook@chromium.org > BUG=137141 > TEST=ash_unittest --gtest_filter=*.CheckDragInsertBoundsWithMultiMonitor > > Review URL: https://codereview.chromium.org/74853002 TBR=simonhong@chromium.org Review URL: https://codereview.chromium.org/73233003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235947 0039d316-1c4b-4281-b951-d872f2087c98
* Reland - [ash] Enable dragging an item between shelf and overflow bubblesimonhong@chromium.org2013-11-191-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | Previous cl (https://codereview.chromium.org/61703002/) was reverted because win8-aura doesn't support multiple display. Description Copied from original cl: This is the first CL to implement drag and drop from overflow bubble to shelf. Currently ripped off item from overflow bubble cannot be dragged into shelf. But, Item should be dragged from overflow bubble to shelf to implement drag & drop. In this CL, re-insert bounds for shelf/overflow bubble is re-defined like below. - shelf -bounds that include visible items. - overflow bubble - overflow bubble bounds. * The method of ripping off is not changed (dragging an item to above only in bottom alignment) If ripping off is possible by dragging to down side, it could cause flickering because overflow bubble and shelf is located too closely. R=jamescook@chromium.org BUG=137141 TEST=ash_unittest --gtest_filter=*.CheckDragInsertBoundsWithMultiMonitor Review URL: https://codereview.chromium.org/74853002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235935 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 235533 because the test added in the CL fails on win8-aurasadrul@chromium.org2013-11-171-221/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash trace is as follows: [2188:1892:1117/092153:837538:FATAL:display_manager.cc(571)] Check failed: 1u == updated_display_info_list.size() (1 vs. 2)Multiple display test does not work on Win8 bots. Please skip (don't disable) the test using SupportsMultipleDisplays() Backtrace: base::debug::StackTrace::StackTrace [0x6C2DBBF1+33] logging::LogMessage::~LogMessage [0x6C10D2FE+94] ash::internal::DisplayManager::UpdateDisplays [0x5BC233C5+293] ash::internal::DisplayManager::OnNativeDisplaysChanged [0x5BC22B43+2723] ash::test::DisplayManagerTestApi::UpdateDisplay [0x00CDB1D7+775] ash::test::AshTestBase::UpdateDisplay [0x00CD7309+121] ash::test::ShelfViewMultiMonitorTest::SetUp [0x0098B136+102] testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x00CAF59F+319] testing::Test::Run [0x00C99FBB+107] testing::TestInfo::Run [0x00C9A9CD+221] testing::TestCase::Run [0x00C9B17F+239] testing::internal::UnitTestImpl::RunAllTests [0x00CA1ACD+701] testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x00CB01C7+327] testing::UnitTest::Run [0x00CA0330+192] base::TestSuite::Run [0x00C8EEE0+240] main [0x00BA9227+103] __tmainCRTStartup [0x00E1978F+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555) mainCRTStartup [0x00E195BF+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371) BaseThreadInitThunk [0x76638543+14] RtlInitializeExceptionChain [0x7788AC69+133] RtlInitializeExceptionChain [0x7788AC3C+88] > [ash] Enable dragging an item from the overflow bubble to the shelf bounds > > This is the first CL to implement drag and drop from overflow bubble to shelf. > > Currently ripped off item from overflow bubble cannot be dragged into shelf. > But, Item should be dragged from overflow bubble to shelf to implement drag & drop. > In this CL, re-insert bounds for shelf/overflow bubble is re-defined like below. > - shelf -bounds that include visible items. > - overflow bubble - overflow bubble bounds. > > * The method of ripping off is not changed (dragging an item to above only in bottom alignment) > If ripping off is possible by dragging to down side, it could cause flickering because overflow bubble and shelf is located too closely. > > R=harrym@chromium.org, jamescook@chromium.org > BUG=137141 > TEST=browser_tests, ash_unittests > > Review URL: https://codereview.chromium.org/61703002 TBR=simon.hong81@gmail.com Review URL: https://codereview.chromium.org/74733002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235537 0039d316-1c4b-4281-b951-d872f2087c98
* [ash] Enable dragging an item from the overflow bubble to the shelf boundssimon.hong81@gmail.com2013-11-171-0/+221
This is the first CL to implement drag and drop from overflow bubble to shelf. Currently ripped off item from overflow bubble cannot be dragged into shelf. But, Item should be dragged from overflow bubble to shelf to implement drag & drop. In this CL, re-insert bounds for shelf/overflow bubble is re-defined like below. - shelf -bounds that include visible items. - overflow bubble - overflow bubble bounds. * The method of ripping off is not changed (dragging an item to above only in bottom alignment) If ripping off is possible by dragging to down side, it could cause flickering because overflow bubble and shelf is located too closely. R=harrym@chromium.org, jamescook@chromium.org BUG=137141 TEST=browser_tests, ash_unittests Review URL: https://codereview.chromium.org/61703002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235533 0039d316-1c4b-4281-b951-d872f2087c98