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

Side by Side Diff: chrome/browser/themes/theme_properties.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/themes/browser_theme_pack.cc ('k') | chrome/browser/themes/theme_service.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/themes/theme_properties.h" 5 #include "chrome/browser/themes/theme_properties.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chrome/browser/themes/browser_theme_pack.h" 10 #include "chrome/browser/themes/browser_theme_pack.h"
11 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
12 #include "grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 13
14 namespace { 14 namespace {
15 15
16 // ---------------------------------------------------------------------------- 16 // ----------------------------------------------------------------------------
17 // Defaults for properties which are stored in the browser theme pack. If you 17 // Defaults for properties which are stored in the browser theme pack. If you
18 // change these defaults, you must increment the version number in 18 // change these defaults, you must increment the version number in
19 // browser_theme_pack.h 19 // browser_theme_pack.h
20 20
21 // Default colors. 21 // Default colors.
22 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 case NTP_BACKGROUND_ALIGNMENT: 311 case NTP_BACKGROUND_ALIGNMENT:
312 return kDefaultDisplayPropertyNTPAlignment; 312 return kDefaultDisplayPropertyNTPAlignment;
313 case NTP_BACKGROUND_TILING: 313 case NTP_BACKGROUND_TILING:
314 return kDefaultDisplayPropertyNTPTiling; 314 return kDefaultDisplayPropertyNTPTiling;
315 case NTP_LOGO_ALTERNATE: 315 case NTP_LOGO_ALTERNATE:
316 return kDefaultDisplayPropertyNTPAlternateLogo; 316 return kDefaultDisplayPropertyNTPAlternateLogo;
317 } 317 }
318 318
319 return -1; 319 return -1;
320 } 320 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/browser_theme_pack.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698