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

Unified Diff: chrome/browser/ui/views/outdated_upgrade_bubble_view.h

Issue 211543008: Show a modified outdated upgrade Bubble for non-enterprise users without auto-update (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Shot in the dark to try and prevent Mac crashes... Created 6 years, 9 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/outdated_upgrade_bubble_view.h
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.h b/chrome/browser/ui/views/outdated_upgrade_bubble_view.h
index 7a66a6941230495449e9d3b0372747d2a0bcb247..8c410c8fffa3a6f1864265df0e0177a435f020aa 100644
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.h
+++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.h
@@ -24,7 +24,8 @@ class OutdatedUpgradeBubbleView : public views::BubbleDelegateView,
public views::ButtonListener {
public:
static void ShowBubble(views::View* anchor_view,
- content::PageNavigator* navigator);
+ content::PageNavigator* navigator,
+ bool auto_update_enabled);
// Identifies if we are running a build that supports the
// outdated upgrade bubble view.
@@ -38,7 +39,8 @@ class OutdatedUpgradeBubbleView : public views::BubbleDelegateView,
private:
OutdatedUpgradeBubbleView(views::View* anchor_view,
- content::PageNavigator* navigator);
+ content::PageNavigator* navigator,
+ bool auto_update_enabled);
virtual ~OutdatedUpgradeBubbleView();
static bool IsShowing() { return upgrade_bubble_ != NULL; }
@@ -60,11 +62,16 @@ class OutdatedUpgradeBubbleView : public views::BubbleDelegateView,
// reinstall.
static int num_ignored_bubbles_;
- // Identifies if the reinstall button was hit before closing the bubble.
- bool chose_to_reinstall_;
+ // Identifies if auto-update is enabled or not.
+ bool auto_update_enabled_;
- // Button that takes the user to the Chrome download page.
- views::LabelButton* reinstall_button_;
+ // Identifies if the accept button was hit before closing the bubble.
+ bool accepted_;
+
+ // Button that lets the user accept the proposal, which is to navigate to a
+ // Chrome download page when |auto_update_enabled_| is true, or attempt to
+ // re-enable auto-update otherwise.
+ views::LabelButton* accept_button_;
// Button for the user to be reminded later about the outdated upgrade.
views::LabelButton* later_button_;
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/outdated_upgrade_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698