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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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/ui/views/wrench_menu.cc ('k') | chrome/browser/ui/webui/bookmarks_ui.cc » ('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 "grit/generated_resources.h" 7 #include "grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "grit/theme_resources_standard.h"
10 #include "grit/ui_resources.h" 9 #include "grit/ui_resources.h"
11 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/image/image.h" 12 #include "ui/gfx/image/image.h"
14 13
15 namespace { 14 namespace {
16 const int kInvalidRessourceID = -1; 15 const int kInvalidRessourceID = -1;
17 } 16 }
18 17
19 WebsiteSettingsUI::CookieInfo::CookieInfo() 18 WebsiteSettingsUI::CookieInfo::CookieInfo()
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } 202 }
204 203
205 // static 204 // static
206 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 205 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
207 const string16& first_visit) { 206 const string16& first_visit) {
208 // FIXME(markusheintz): Display a minor warning icon if the page is visited 207 // FIXME(markusheintz): Display a minor warning icon if the page is visited
209 // the first time. 208 // the first time.
210 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 209 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
211 return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO); 210 return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO);
212 } 211 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/wrench_menu.cc ('k') | chrome/browser/ui/webui/bookmarks_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698