Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: chrome/browser/ui/views/elevation_icon_setter.cc

Issue 941133002: Update global error bubble view's boundary (position and size) after loading elevation icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/elevation_icon_setter.cc
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc
index ccffcbe689cba7373154f52e96654470267f9b5a..356c71d22238934e59b3620e1226ad8c43872369 100644
--- a/chrome/browser/ui/views/elevation_icon_setter.cc
+++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/elevation_icon_setter.h"
+#include "base/callback.h"
#include "base/task_runner_util.h"
#include "content/public/browser/browser_thread.h"
#include "ui/views/controls/button/label_button.h"
@@ -56,7 +57,8 @@ scoped_ptr<SkBitmap> GetElevationIcon() {
// ElevationIconSetter --------------------------------------------------------
-ElevationIconSetter::ElevationIconSetter(views::LabelButton* button)
+ElevationIconSetter::ElevationIconSetter(views::LabelButton* button,
+ const base::Closure& callback)
: button_(button),
weak_factory_(this) {
base::PostTaskAndReplyWithResult(
@@ -64,13 +66,15 @@ ElevationIconSetter::ElevationIconSetter(views::LabelButton* button)
FROM_HERE,
base::Bind(&GetElevationIcon),
base::Bind(&ElevationIconSetter::SetButtonIcon,
- weak_factory_.GetWeakPtr()));
+ weak_factory_.GetWeakPtr(),
+ callback));
}
ElevationIconSetter::~ElevationIconSetter() {
}
-void ElevationIconSetter::SetButtonIcon(scoped_ptr<SkBitmap> icon) {
+void ElevationIconSetter::SetButtonIcon(const base::Closure& callback,
+ scoped_ptr<SkBitmap> icon) {
if (icon) {
float device_scale_factor = 1.0f;
#if defined(OS_WIN)
@@ -84,5 +88,7 @@ void ElevationIconSetter::SetButtonIcon(scoped_ptr<SkBitmap> icon) {
button_->SizeToPreferredSize();
if (button_->parent())
button_->parent()->Layout();
+ if (!callback.is_null())
+ callback.Run();
}
}
« no previous file with comments | « chrome/browser/ui/views/elevation_icon_setter.h ('k') | chrome/browser/ui/views/global_error_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698