chrome/browser/content_settings/permission_infobar_delegate.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/content_settings/permission_infobar_delegate.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_settings/permission_bubble_request_impl.cc ('k') | chrome/browser/custom_handlers/protocol_handler_registry.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 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/content_settings/permission_infobar_delegate.h"	5 #include "chrome/browser/content_settings/permission_infobar_delegate.h"

6	6

7 #include "chrome/browser/content_settings/permission_context_uma_util.h"	7 #include "chrome/browser/content_settings/permission_context_uma_util.h"

8 #include "chrome/browser/content_settings/permission_queue_controller.h"	8 #include "chrome/browser/content_settings/permission_queue_controller.h"

	9 #include "chrome/grit/generated_resources.h"

9 #include "components/infobars/core/infobar.h"	10 #include "components/infobars/core/infobar.h"

10 #include "grit/generated_resources.h"

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

12	12

13 PermissionInfobarDelegate::~PermissionInfobarDelegate() {	13 PermissionInfobarDelegate::~PermissionInfobarDelegate() {

14 if (!action_taken_)	14 if (!action_taken_)

15 PermissionContextUmaUtil::PermissionIgnored(type_);	15 PermissionContextUmaUtil::PermissionIgnored(type_);

16 }	16 }

17	17

18 PermissionInfobarDelegate::PermissionInfobarDelegate(	18 PermissionInfobarDelegate::PermissionInfobarDelegate(

19 PermissionQueueController* controller,	19 PermissionQueueController* controller,

20 const PermissionRequestID& id,	20 const PermissionRequestID& id,

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52	52

53 void PermissionInfobarDelegate::SetPermission(bool update_content_setting,	53 void PermissionInfobarDelegate::SetPermission(bool update_content_setting,

54 bool allowed) {	54 bool allowed) {

55 action_taken_ = true;	55 action_taken_ = true;

56 controller_->OnPermissionSet(	56 controller_->OnPermissionSet(

57 id_, requesting_origin_,	57 id_, requesting_origin_,

58 InfoBarService::WebContentsFromInfoBar(	58 InfoBarService::WebContentsFromInfoBar(

59 infobar())->GetLastCommittedURL().GetOrigin(),	59 infobar())->GetLastCommittedURL().GetOrigin(),

60 update_content_setting, allowed);	60 update_content_setting, allowed);

61 }	61 }

OLD	NEW