chrome/browser/ui/page_info/website_settings_ui.cc - Issue 2744823004: Move cross-platform Page Info UI code to its own folder.

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/page_info/website_settings_ui.cc

Issue 2744823004: Move cross-platform Page Info UI code to its own folder. (Closed)

Patch Set: Update test build file with changes not caught by mass-rename.py Created 3 years, 9 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

« no previous file with comments | « chrome/browser/ui/page_info/website_settings_ui.h ('k') | chrome/browser/ui/page_info/website_settings_unittest.cc » ('j') | no next file with comments »

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

6	6

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

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

9 #include "chrome/browser/plugins/plugin_utils.h"	9 #include "chrome/browser/plugins/plugin_utils.h"

10 #include "chrome/browser/plugins/plugins_field_trial.h"	10 #include "chrome/browser/plugins/plugins_field_trial.h"

11 #include "chrome/common/chrome_features.h"	11 #include "chrome/common/chrome_features.h"

12 #include "chrome/grit/chromium_strings.h"	12 #include "chrome/grit/chromium_strings.h"

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

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

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

(...skipping 371 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
387 }	387 }

388 return resource_id;	388 return resource_id;

389 }	389 }

390	390

391 // static	391 // static

392 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(	392 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(

393 WebsiteSettings::SiteConnectionStatus status) {	393 WebsiteSettings::SiteConnectionStatus status) {

394 ResourceBundle& rb = ResourceBundle::GetSharedInstance();	394 ResourceBundle& rb = ResourceBundle::GetSharedInstance();

395 return rb.GetNativeImageNamed(GetConnectionIconID(status));	395 return rb.GetNativeImageNamed(GetConnectionIconID(status));

396 }	396 }

OLD	NEW