diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 11:28:57 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 11:28:57 +0000 |
| commit | f029034dfb1759a6df1dd24b8deee71d9c7c2ddb (patch) | |
| tree | ddf13809906c31f21239d7a7a54dc8c7e226f543 /ash/launcher | |
| parent | aef62ea084d57c28f6f40f3ff8a180e72ed89d9c (diff) | |
| download | chromium_src-f029034dfb1759a6df1dd24b8deee71d9c7c2ddb.zip chromium_src-f029034dfb1759a6df1dd24b8deee71d9c7c2ddb.tar.gz chromium_src-f029034dfb1759a6df1dd24b8deee71d9c7c2ddb.tar.bz2 | |
(Views only) Enable setting individual marigin values for top, left, bottom and right margin in bubbles.
Set the left and right margin of the Website Settings popup to 0.
BUG=113688
TEST=The left and right margin (distance popup border to popup content) of the Website Settings popup is 0.
Review URL: https://chromiumcodereview.appspot.com/10692188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.cc | 4 | ||||
| -rw-r--r-- | ash/launcher/overflow_bubble.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc index 188ef88..f0741fe 100644 --- a/ash/launcher/launcher_tooltip_manager.cc +++ b/ash/launcher/launcher_tooltip_manager.cc @@ -12,6 +12,7 @@ #include "base/time.h" #include "base/timer.h" #include "ui/aura/window.h" +#include "ui/gfx/insets.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/layout/fill_layout.h" @@ -71,7 +72,8 @@ LauncherTooltipManager::LauncherTooltipBubble::LauncherTooltipBubble( set_close_on_esc(false); set_close_on_deactivate(false); set_use_focusless(true); - set_margin(kTooltipMargin); + set_margins(gfx::Insets(kTooltipMargin, kTooltipMargin, kTooltipMargin, + kTooltipMargin)); SetLayoutManager(new views::FillLayout()); // The anchor may not have the widget in tests. if (anchor->GetWidget() && anchor->GetWidget()->GetNativeView()) { diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc index e335f5b..ec7437f 100644 --- a/ash/launcher/overflow_bubble.cc +++ b/ash/launcher/overflow_bubble.cc @@ -8,6 +8,7 @@ #include "ash/launcher/launcher_types.h" #include "ash/launcher/launcher_view.h" +#include "ui/gfx/insets.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" @@ -120,7 +121,7 @@ void OverflowBubbleView::InitOverflowBubble(LauncherDelegate* delegate, set_arrow_location(GetBubbleArrowLocation(shelf_alignment)); set_background(NULL); set_color(kLauncherColor); - set_margin(kPadding); + set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding)); set_move_with_anchor(true); views::BubbleDelegateView::CreateBubble(this); } |