chrome/browser/history/top_sites.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/history/top_sites.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (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/history/chrome_history_client.cc ('k') | chrome/browser/importer/external_process_importer_client.cc » ('j') | no next file with comments »

OLD	NEW
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/history/top_sites.h"	5 #include "chrome/browser/history/top_sites.h"

6	6

7 #include "base/strings/string_util.h"	7 #include "base/strings/string_util.h"

8 #include "chrome/browser/history/top_sites_impl.h"	8 #include "chrome/browser/history/top_sites_impl.h"

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

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

11 #include "grit/locale_settings.h"	11 #include "grit/locale_settings.h"

12 #include "grit/theme_resources.h"	12 #include "grit/theme_resources.h"

13	13

14 namespace history {	14 namespace history {

15	15

16 const TopSites::PrepopulatedPage kPrepopulatedPages[] = {	16 const TopSites::PrepopulatedPage kPrepopulatedPages[] = {

17 #if defined(OS_ANDROID)	17 #if defined(OS_ANDROID)

18 { IDS_MOBILE_WELCOME_URL, IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,	18 { IDS_MOBILE_WELCOME_URL, IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,

19 IDR_PRODUCT_LOGO_16, IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL,	19 IDR_PRODUCT_LOGO_16, IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL,

20 SkColorSetRGB(0, 147, 60) }	20 SkColorSetRGB(0, 147, 60) }

(...skipping 10 matching lines...) Expand all Loading...
31 };	31 };

32	32

33 // static	33 // static

34 TopSites* TopSites::Create(Profile* profile, const base::FilePath& db_name) {	34 TopSites* TopSites::Create(Profile* profile, const base::FilePath& db_name) {

35 TopSitesImpl* top_sites_impl = new TopSitesImpl(profile);	35 TopSitesImpl* top_sites_impl = new TopSitesImpl(profile);

36 top_sites_impl->Init(db_name);	36 top_sites_impl->Init(db_name);

37 return top_sites_impl;	37 return top_sites_impl;

38 }	38 }

39	39

40 } // namespace history	40 } // namespace history

OLD	NEW