Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 1709633002: Componentize miscellaneous resources to share them with iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@1
Patch Set: Rebase Created 4 years, 10 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/app/generated_resources.grd ('k') | components/components_strings.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/website_settings/website_settings_ui.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/grit/chromium_strings.h" 8 #include "chrome/grit/chromium_strings.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/content_settings/core/browser/plugins_field_trial.h" 10 #include "components/content_settings/core/browser/plugins_field_trial.h"
11 #include "components/strings/grit/components_strings.h"
11 #include "grit/theme_resources.h" 12 #include "grit/theme_resources.h"
12 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
15 16
16 namespace { 17 namespace {
17 18
18 const int kInvalidResourceID = -1; 19 const int kInvalidResourceID = -1;
19 20
20 // The resource IDs for the strings that are displayed on the permissions 21 // The resource IDs for the strings that are displayed on the permissions
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 } 362 }
362 return resource_id; 363 return resource_id;
363 } 364 }
364 365
365 // static 366 // static
366 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 367 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
367 WebsiteSettings::SiteConnectionStatus status) { 368 WebsiteSettings::SiteConnectionStatus status) {
368 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 369 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
369 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 370 return rb.GetNativeImageNamed(GetConnectionIconID(status));
370 } 371 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | components/components_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698