chrome/browser/ui/views/critical_notification_bubble_view.cc - Issue 10656014: Merge 143605 - grd file update for new 2x assets

Side by Side Diff: chrome/browser/ui/views/critical_notification_bubble_view.cc

Issue 10656014: Merge 143605 - grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"	5 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"

6	6

7 #include "base/string_number_conversions.h"	7 #include "base/string_number_conversions.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/lifetime/application_lifetime.h"	10 #include "chrome/browser/lifetime/application_lifetime.h"

11 #include "chrome/browser/prefs/pref_service.h"	11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/upgrade_detector.h"	12 #include "chrome/browser/upgrade_detector.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "content/public/browser/user_metrics.h"	14 #include "content/public/browser/user_metrics.h"

15 #include "grit/chromium_strings.h"	15 #include "grit/chromium_strings.h"

16 #include "grit/generated_resources.h"	16 #include "grit/generated_resources.h"

17 #include "grit/locale_settings.h"	17 #include "grit/locale_settings.h"

18 #include "grit/theme_resources.h"	18 #include "grit/theme_resources_standard.h"

19 #include "ui/base/accelerators/accelerator.h"	19 #include "ui/base/accelerators/accelerator.h"

20 #include "ui/base/accessibility/accessible_view_state.h"	20 #include "ui/base/accessibility/accessible_view_state.h"

21 #include "ui/base/l10n/l10n_util.h"	21 #include "ui/base/l10n/l10n_util.h"

22 #include "ui/base/resource/resource_bundle.h"	22 #include "ui/base/resource/resource_bundle.h"

23 #include "ui/views/controls/button/text_button.h"	23 #include "ui/views/controls/button/text_button.h"

24 #include "ui/views/controls/image_view.h"	24 #include "ui/views/controls/image_view.h"

25 #include "ui/views/controls/label.h"	25 #include "ui/views/controls/label.h"

26 #include "ui/views/layout/grid_layout.h"	26 #include "ui/views/layout/grid_layout.h"

27 #include "ui/views/layout/layout_constants.h"	27 #include "ui/views/layout/layout_constants.h"

28 #include "ui/views/widget/widget.h"	28 #include "ui/views/widget/widget.h"

(...skipping 189 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
218 dismiss_button_ = new views::NativeTextButton(this,	218 dismiss_button_ = new views::NativeTextButton(this,

219 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS));	219 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS));

220 layout->AddView(dismiss_button_);	220 layout->AddView(dismiss_button_);

221	221

222 refresh_timer_.Start(FROM_HERE,	222 refresh_timer_.Start(FROM_HERE,

223 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery),	223 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery),

224 this, &CriticalNotificationBubbleView::OnCountdown);	224 this, &CriticalNotificationBubbleView::OnCountdown);

225	225

226 content::RecordAction(UserMetricsAction("CriticalNotificationShown"));	226 content::RecordAction(UserMetricsAction("CriticalNotificationShown"));

227 }	227 }

OLD	NEW