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

Side by Side Diff: chrome/browser/dom_ui/new_tab_ui.cc

Issue 147247: Remove null link from "welcome to tips" default suggestion. Also make some h... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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/app/generated_resources.grd ('k') | chrome/browser/dom_ui/tips_handler.h » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/dom_ui/new_tab_ui.h" 7 #include "chrome/browser/dom_ui/new_tab_ui.h"
8 8
9 #include "app/animation.h" 9 #include "app/animation.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 localized_strings.SetString(L"closedwindowsingle", 290 localized_strings.SetString(L"closedwindowsingle",
291 l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE)); 291 l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE));
292 localized_strings.SetString(L"closedwindowmultiple", 292 localized_strings.SetString(L"closedwindowmultiple",
293 l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE)); 293 l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE));
294 localized_strings.SetString(L"attributionintro", 294 localized_strings.SetString(L"attributionintro",
295 l10n_util::GetString(IDS_NEW_TAB_ATTRIBUTION_INTRO)); 295 l10n_util::GetString(IDS_NEW_TAB_ATTRIBUTION_INTRO));
296 localized_strings.SetString(L"resourcecache", 296 localized_strings.SetString(L"resourcecache",
297 l10n_util::GetString(IDS_NEW_TAB_WEB_RESOURCE_CACHE)); 297 l10n_util::GetString(IDS_NEW_TAB_WEB_RESOURCE_CACHE));
298 localized_strings.SetString(L"recentactivities", 298 localized_strings.SetString(L"recentactivities",
299 l10n_util::GetString(IDS_NEW_TAB_RECENT_ACTIVITIES)); 299 l10n_util::GetString(IDS_NEW_TAB_RECENT_ACTIVITIES));
300 localized_strings.SetString(L"tipsandsuggestions",
301 l10n_util::GetString(IDS_NEW_TAB_TIPS));
302 localized_strings.SetString(L"defaulttipstitle",
303 l10n_util::GetString(IDS_NEW_TAB_DEFAULT_TIPS_TITLE));
300 localized_strings.SetString(L"downloads", 304 localized_strings.SetString(L"downloads",
301 l10n_util::GetString(IDS_NEW_TAB_DOWNLOADS)); 305 l10n_util::GetString(IDS_NEW_TAB_DOWNLOADS));
302 localized_strings.SetString(L"viewfullhistory", 306 localized_strings.SetString(L"viewfullhistory",
303 l10n_util::GetString(IDS_NEW_TAB_VIEW_FULL_HISTORY)); 307 l10n_util::GetString(IDS_NEW_TAB_VIEW_FULL_HISTORY));
304 localized_strings.SetString(L"viewalldownloads", 308 localized_strings.SetString(L"viewalldownloads",
305 l10n_util::GetString(IDS_NEW_TAB_VIEW_ALL_DOWNLOADS)); 309 l10n_util::GetString(IDS_NEW_TAB_VIEW_ALL_DOWNLOADS));
306 localized_strings.SetString(L"showthumbnails", 310 localized_strings.SetString(L"showthumbnails",
307 l10n_util::GetString(IDS_NEW_TAB_SHOW_THUMBNAILS)); 311 l10n_util::GetString(IDS_NEW_TAB_SHOW_THUMBNAILS));
308 localized_strings.SetString(L"hidethumbnails", 312 localized_strings.SetString(L"hidethumbnails",
309 l10n_util::GetString(IDS_NEW_TAB_HIDE_THUMBNAILS)); 313 l10n_util::GetString(IDS_NEW_TAB_HIDE_THUMBNAILS));
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 if (NewTabUI::EnableWebResources()) 1487 if (NewTabUI::EnableWebResources())
1484 TipsHandler::RegisterUserPrefs(prefs); 1488 TipsHandler::RegisterUserPrefs(prefs);
1485 } 1489 }
1486 1490
1487 // static 1491 // static
1488 bool NewTabUI::UseOldNewTabPage() { 1492 bool NewTabUI::UseOldNewTabPage() {
1489 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 1493 const CommandLine* command_line = CommandLine::ForCurrentProcess();
1490 return command_line->HasSwitch(switches::kOldNewTabPage); 1494 return command_line->HasSwitch(switches::kOldNewTabPage);
1491 } 1495 }
1492 1496
1497 // static
1493 bool NewTabUI::EnableWebResources() { 1498 bool NewTabUI::EnableWebResources() {
1494 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 1499 const CommandLine* command_line = CommandLine::ForCurrentProcess();
1495 return command_line->HasSwitch(switches::kWebResources); 1500 return command_line->HasSwitch(switches::kWebResources);
1496 } 1501 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/tips_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698