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

Side by Side Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 years, 9 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/webui/ntp/app_launcher_handler.cc ('k') | chrome/chrome_browser.gypi » ('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/webui/ntp/ntp_resource_cache.h" 5 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_launcher.h" 10 #include "apps/app_launcher.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 load_time_data.SetString("undothumbnailremove", 355 load_time_data.SetString("undothumbnailremove",
356 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE)); 356 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE));
357 load_time_data.SetString("removethumbnailtooltip", 357 load_time_data.SetString("removethumbnailtooltip",
358 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP)); 358 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP));
359 load_time_data.SetString("appuninstall", 359 load_time_data.SetString("appuninstall",
360 l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); 360 l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL));
361 load_time_data.SetString("appoptions", 361 load_time_data.SetString("appoptions",
362 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS)); 362 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS));
363 load_time_data.SetString("appdetails", 363 load_time_data.SetString("appdetails",
364 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_DETAILS)); 364 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_DETAILS));
365 load_time_data.SetString("appdisablenotifications",
366 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_DISABLE_NOTIFICATIONS));
367 load_time_data.SetString("appcreateshortcut", 365 load_time_data.SetString("appcreateshortcut",
368 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_CREATE_SHORTCUT)); 366 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_CREATE_SHORTCUT));
369 load_time_data.SetString("appDefaultPageName", 367 load_time_data.SetString("appDefaultPageName",
370 l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)); 368 l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME));
371 load_time_data.SetString("applaunchtypepinned", 369 load_time_data.SetString("applaunchtypepinned",
372 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED)); 370 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
373 load_time_data.SetString("applaunchtyperegular", 371 load_time_data.SetString("applaunchtyperegular",
374 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR)); 372 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR));
375 load_time_data.SetString("applaunchtypewindow", 373 load_time_data.SetString("applaunchtypewindow",
376 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW)); 374 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 // Get our template. 593 // Get our template.
596 static const base::StringPiece new_tab_theme_css( 594 static const base::StringPiece new_tab_theme_css(
597 ResourceBundle::GetSharedInstance().GetRawDataResource( 595 ResourceBundle::GetSharedInstance().GetRawDataResource(
598 IDR_NEW_TAB_4_THEME_CSS)); 596 IDR_NEW_TAB_4_THEME_CSS));
599 597
600 // Create the string from our template and the replacements. 598 // Create the string from our template and the replacements.
601 std::string css_string; 599 std::string css_string;
602 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 600 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
603 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 601 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
604 } 602 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/app_launcher_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698