Chromium-MultiProfile-Prototype...

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2008 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/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/template_url.h"
+#include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
@@ skipping 132 matching lines @@
 }
 
 void NewTabHTMLSource::StartDataRequest(const std::string& path,
                                         int request_id) {
   if (!path.empty()) {
     // A path under new-tab was requested; it's likely a bad relative
     // URL from the new tab page, but in any case it's an error.
     NOTREACHED();
     return;
   }
+
+  // Show the profile name in the title and most visited labels if the current
+  // profile is not the default.
+  std::wstring title;
+  std::wstring most_visited;
+  if (UserDataManager::Get()->is_current_profile_default()) {
+    title = l10n_util::GetString(IDS_NEW_TAB_TITLE);
+    most_visited = l10n_util::GetString(IDS_NEW_TAB_MOST_VISITED);
+  } else {
+    // Get the current profile name.
+    std::wstring profile_name =
+      UserDataManager::Get()->current_profile_name();
+    title = l10n_util::GetStringF(IDS_NEW_TAB_TITLE_WITH_PROFILE_NAME,
+                                  profile_name);
+    most_visited = l10n_util::GetStringF(
+        IDS_NEW_TAB_MOST_VISITED_WITH_PROFILE_NAME,
+        profile_name);
+  }
   DictionaryValue localized_strings;
-  localized_strings.SetString(L"title",
-      l10n_util::GetString(IDS_NEW_TAB_TITLE));
-  localized_strings.SetString(L"mostvisited",
-      l10n_util::GetString(IDS_NEW_TAB_MOST_VISITED));
+  localized_strings.SetString(L"title", title);
+  localized_strings.SetString(L"mostvisited", most_visited);
   localized_strings.SetString(L"searches",
       l10n_util::GetString(IDS_NEW_TAB_SEARCHES));
   localized_strings.SetString(L"bookmarks",
       l10n_util::GetString(IDS_NEW_TAB_BOOKMARKS));
   localized_strings.SetString(L"showhistory",
       l10n_util::GetString(IDS_NEW_TAB_HISTORY_SHOW));
   localized_strings.SetString(L"searchhistory",
       l10n_util::GetString(IDS_NEW_TAB_HISTORY_SEARCH));
   localized_strings.SetString(L"closedtabs",
       l10n_util::GetString(IDS_NEW_TAB_CLOSED_TABS));
@@ skipping 648 matching lines @@
   return GURL(url);
 }
 
 NewTabUIContents::NewTabUIContents(Profile* profile,
     SiteInstance* instance, RenderViewHostFactory* render_view_factory) :
     DOMUIHost(profile, instance, render_view_factory),
     motd_message_id_(0),
     incognito_(false),
     most_visited_handler_(NULL) {
   set_type(TAB_CONTENTS_NEW_TAB_UI);
-  set_forced_title(l10n_util::GetString(IDS_NEW_TAB_TITLE));
+
+  // Show profile name in the title if the current profile is not the default.
+  std::wstring title;
+  if (UserDataManager::Get()->is_current_profile_default()) {
+    title = l10n_util::GetString(IDS_NEW_TAB_TITLE);
+  } else {
+    title = l10n_util::GetStringF(
+        IDS_NEW_TAB_TITLE_WITH_PROFILE_NAME,
+        UserDataManager::Get()->current_profile_name());
+  }
+  set_forced_title(title);
 
   if (profile->IsOffTheRecord())
     incognito_ = true;
 
   if (NewTabHTMLSource::first_view() &&
       (profile->GetPrefs()->GetInteger(prefs::kRestoreOnStartup) != 0 ||
        !profile->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
      ) {
     NewTabHTMLSource::set_first_view(false);
   }
@@ skipping 74 matching lines @@
 void NewTabUIContents::RequestOpenURL(const GURL& url,
                                       const GURL& /*referrer*/,
                                       WindowOpenDisposition disposition) {
   // The user opened a URL on the page (including "open in new window").
   // We count all such clicks as AUTO_BOOKMARK, which increments the site's
   // visit count (which is used for ranking the most visited entries).
   // Note this means we're including clicks on not only most visited thumbnails,
   // but also clicks on recently bookmarked.
   OpenURL(url, GURL(), disposition, PageTransition::AUTO_BOOKMARK);
 }