Revert 60997 - o Add user customizable launch type for apps by adding options...

chrome/browser/dom_ui/ntp_resource_cache.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
@@ skipping 249 matching lines @@
   localized_strings.SetString("pagedisplaytooltip",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_PAGE_DISPLAY_TOOLTIP));
   localized_strings.SetString("firstrunnotification",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_FIRST_RUN_NOTIFICATION));
   localized_strings.SetString("closefirstrunnotification",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_CLOSE_FIRST_RUN_NOTIFICATION));
   localized_strings.SetString("tips",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_TIPS));
   localized_strings.SetString("close", l10n_util::GetStringUTF16(IDS_CLOSE));
   localized_strings.SetString("history",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_HISTORY));
+                              l10n_util::GetStringUTF16(IDS_NEW_TAB_HISTORY));
   localized_strings.SetString("downloads",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_DOWNLOADS));
+                              l10n_util::GetStringUTF16(IDS_NEW_TAB_DOWNLOADS));
   localized_strings.SetString("help",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_HELP));
+                              l10n_util::GetStringUTF16(IDS_NEW_TAB_HELP));
   localized_strings.SetString("helpurl",
       GetUrlWithLang(GURL(kHelpContentUrl)));
   localized_strings.SetString("appsettings",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS));
   localized_strings.SetString("appuninstall",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_UNINSTALL));
   localized_strings.SetString("appoptions",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS));
-  localized_strings.SetString("applaunchtypepinned",
-      l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
-  localized_strings.SetString("applaunchtyperegular",
-      l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR));
-  localized_strings.SetString("applaunchtypefullscreen",
-      l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));
   localized_strings.SetString("web_store_title",
       l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE));
   localized_strings.SetString("web_store_url",
       GetUrlWithLang(GURL(Extension::ChromeStoreURL())));
 
   // Don't initiate the sync related message passing with the page if the sync
   // code is not present.
   if (profile_->GetProfileSyncService())
     localized_strings.SetString("syncispresent", "true");
   else
@@ skipping 185 matching lines @@
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
 
   new_tab_css_ = new RefCountedBytes;
   new_tab_css_->data.resize(css_string.size());
   std::copy(css_string.begin(), css_string.end(),
             new_tab_css_->data.begin());
 }