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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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
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 "chrome/grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/gfx/image/image.h" 11 #include "ui/gfx/image/image.h"
12 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 13
14 namespace { 14 namespace {
15 15
16 const int kInvalidResourceID = -1; 16 const int kInvalidResourceID = -1;
17 17
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 // the first time. 327 // the first time.
328 return IDR_PAGEINFO_INFO; 328 return IDR_PAGEINFO_INFO;
329 } 329 }
330 330
331 // static 331 // static
332 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 332 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
333 const base::string16& first_visit) { 333 const base::string16& first_visit) {
334 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 334 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
335 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 335 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
336 } 336 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698