chrome/browser/ui/global_error/global_error.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/global_error/global_error.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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

« chrome/browser/resources_util.cc ('K') | « chrome/browser/ui/content_settings/content_setting_image_model.cc ('k') | chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/global_error/global_error.h"	5 #include "chrome/browser/ui/global_error/global_error.h"

6	6

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

8 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"	8 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"

9 #include "grit/theme_resources.h"	9 #include "grit/theme_resources.h"

10 #include "grit/theme_resources_standard.h"

11	10

12 GlobalError::GlobalError()	11 GlobalError::GlobalError()

13 : has_shown_bubble_view_(false),	12 : has_shown_bubble_view_(false),

14 bubble_view_(NULL) {	13 bubble_view_(NULL) {

15 }	14 }

16	15

17 GlobalError::~GlobalError() {	16 GlobalError::~GlobalError() {

18 }	17 }

19	18

20 int GlobalError::GetBadgeResourceID() {	19 int GlobalError::GetBadgeResourceID() {

(...skipping 20 matching lines...) Expand all Loading...
41	40

42 int GlobalError::GetBubbleViewIconResourceID() {	41 int GlobalError::GetBubbleViewIconResourceID() {

43 return IDR_INPUT_ALERT;	42 return IDR_INPUT_ALERT;

44 }	43 }

45	44

46 void GlobalError::BubbleViewDidClose(Browser* browser) {	45 void GlobalError::BubbleViewDidClose(Browser* browser) {

47 DCHECK(browser);	46 DCHECK(browser);

48 bubble_view_ = NULL;	47 bubble_view_ = NULL;

49 OnBubbleViewDidClose(browser);	48 OnBubbleViewDidClose(browser);

50 }	49 }

OLD	NEW