chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 2276823003: Change many chrome/browser includes to use qualified paths.

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

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/DEPS ('K') | « chrome/browser/ui/views/website_settings/permission_prompt_impl.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

index 6cdad74ec39951e5a526f651a4f97a4d47c5c2ff..a2fcb64a37bac4c4a973c2566ab77bd7d9b024aa 100644

--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

@@ -30,15 +30,15 @@

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

+#include "chrome/grit/theme_resources.h"

#include "components/content_settings/core/common/content_settings_types.h"

#include "components/prefs/pref_service.h"

+#include "components/strings/grit/components_chromium_strings.h"

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/cert_store.h"

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

#include "extensions/common/constants.h"

-#include "grit/components_chromium_strings.h"

-#include "grit/components_strings.h"

-#include "grit/theme_resources.h"

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

#include "ui/base/material_design/material_design_controller.h"

#include "ui/base/models/simple_menu_model.h"