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

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

Issue 8785016: Add menu option for disabling app notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge conflicts Created 9 years 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') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 localized_strings.SetString("undothumbnailremove", 309 localized_strings.SetString("undothumbnailremove",
310 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE)); 310 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE));
311 localized_strings.SetString("removethumbnailtooltip", 311 localized_strings.SetString("removethumbnailtooltip",
312 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP)); 312 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP));
313 localized_strings.SetString("appuninstall", 313 localized_strings.SetString("appuninstall",
314 l10n_util::GetStringFUTF16( 314 l10n_util::GetStringFUTF16(
315 IDS_NEW_TAB_APP_UNINSTALL, 315 IDS_NEW_TAB_APP_UNINSTALL,
316 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); 316 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
317 localized_strings.SetString("appoptions", 317 localized_strings.SetString("appoptions",
318 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS)); 318 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS));
319 localized_strings.SetString("appdisablenotifications",
320 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_DISABLE_NOTIFICATIONS));
319 localized_strings.SetString("appcreateshortcut", 321 localized_strings.SetString("appcreateshortcut",
320 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_CREATE_SHORTCUT)); 322 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_CREATE_SHORTCUT));
321 localized_strings.SetString("appDefaultPageName", 323 localized_strings.SetString("appDefaultPageName",
322 l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)); 324 l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME));
323 localized_strings.SetString("applaunchtypepinned", 325 localized_strings.SetString("applaunchtypepinned",
324 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED)); 326 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
325 localized_strings.SetString("applaunchtyperegular", 327 localized_strings.SetString("applaunchtyperegular",
326 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR)); 328 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR));
327 localized_strings.SetString("applaunchtypewindow", 329 localized_strings.SetString("applaunchtypewindow",
328 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW)); 330 l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 // Get our template. 510 // Get our template.
509 static const base::StringPiece new_tab_theme_css( 511 static const base::StringPiece new_tab_theme_css(
510 ResourceBundle::GetSharedInstance().GetRawDataResource( 512 ResourceBundle::GetSharedInstance().GetRawDataResource(
511 IDR_NEW_TAB_4_THEME_CSS)); 513 IDR_NEW_TAB_4_THEME_CSS));
512 514
513 // Create the string from our template and the replacements. 515 // Create the string from our template and the replacements.
514 std::string css_string; 516 std::string css_string;
515 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 517 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
516 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 518 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
517 } 519 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/app_launcher_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698