ios/chrome/browser/translate/never_translate_infobar_controller.mm - Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h".

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: ios/chrome/browser/translate/never_translate_infobar_controller.mm

Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix bad merge Created 4 years, 4 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "ios/chrome/browser/translate/never_translate_infobar_controller.h"	5 #include "ios/chrome/browser/translate/never_translate_infobar_controller.h"

6	6

7 #include "base/strings/sys_string_conversions.h"	7 #include "base/strings/sys_string_conversions.h"

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

9 #include "components/strings/grit/components_strings.h"	9 #include "components/strings/grit/components_strings.h"

10 #include "components/translate/core/browser/translate_infobar_delegate.h"	10 #include "components/translate/core/browser/translate_infobar_delegate.h"

11 #include "ios/chrome/browser/translate/translate_infobar_tags.h"	11 #include "ios/chrome/browser/translate/translate_infobar_tags.h"

12 #include "ios/chrome/grit/ios_chromium_strings.h"	12 #include "ios/chrome/grit/ios_chromium_strings.h"

13 #include "ios/chrome/grit/ios_google_chrome_strings.h"

14 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"	13 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"

15 #import "ios/public/provider/chrome/browser/ui/infobar_view_delegate.h"	14 #import "ios/public/provider/chrome/browser/ui/infobar_view_delegate.h"

16 #import "ios/public/provider/chrome/browser/ui/infobar_view_protocol.h"	15 #import "ios/public/provider/chrome/browser/ui/infobar_view_protocol.h"

17 #include "ui/base/l10n/l10n_util.h"	16 #include "ui/base/l10n/l10n_util.h"

18 #include "ui/gfx/image/image.h"	17 #include "ui/gfx/image/image.h"

19	18

20 @interface NeverTranslateInfoBarController ()	19 @interface NeverTranslateInfoBarController ()

21	20

22 // Action for any of the user defined buttons.	21 // Action for any of the user defined buttons.

23 - (void)infoBarButtonDidPress:(id)sender;	22 - (void)infoBarButtonDidPress:(id)sender;

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 self.delegate->InfoBarDidCancel();	79 self.delegate->InfoBarDidCancel();

81 } else {	80 } else {

82 DCHECK(buttonId == TranslateInfoBarIOSTag::DENY_LANGUAGE \|\|	81 DCHECK(buttonId == TranslateInfoBarIOSTag::DENY_LANGUAGE \|\|

83 buttonId == TranslateInfoBarIOSTag::DENY_WEBSITE);	82 buttonId == TranslateInfoBarIOSTag::DENY_WEBSITE);

84 self.delegate->InfoBarButtonDidPress(buttonId);	83 self.delegate->InfoBarButtonDidPress(buttonId);

85 }	84 }

86 }	85 }

87 }	86 }

88	87

89 @end	88 @end

OLD	NEW