Sync Promo: Tweak first tabs

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2934 matching lines @@
   // displaying a favicon, which controls the throbber. If we updated it here,
   // the throbber will show the default favicon for a split second when
   // navigating away from the new tab page.
   ScheduleUIUpdate(contents->tab_contents(), TabContents::INVALIDATE_URL);
 
   if (contents_is_selected)
     contents->tab_contents()->Focus();
 }
 
 GURL Browser::GetHomePage() const {
+  return GetHomePageForProfile(profile_);
+}
+
+// static
+GURL Browser::GetHomePageForProfile(Profile* profile) {

[sky, 2011/10/28 16:05:59]

I don't think this method makes much sense on Browser. How about moving it to
Profile?

[sail, 2011/10/28 17:50:57]

Done.

   // --homepage overrides any preferences.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kHomePage)) {
     // TODO(evanm): clean up usage of DIR_CURRENT.
     //   http://code.google.com/p/chromium/issues/detail?id=60630
     // For now, allow this code to call getcwd().
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     FilePath browser_directory;
     PathService::Get(base::DIR_CURRENT, &browser_directory);
     GURL home_page(URLFixerUpper::FixupRelativeFile(browser_directory,
         command_line.GetSwitchValuePath(switches::kHomePage)));
     if (home_page.is_valid())
       return home_page;
   }
 
-  if (profile_->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
+  if (profile->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
     return GURL(chrome::kChromeUINewTabURL);
   GURL home_page(URLFixerUpper::FixupURL(
-      profile_->GetPrefs()->GetString(prefs::kHomePage),
+      profile->GetPrefs()->GetString(prefs::kHomePage),
       std::string()));
   if (!home_page.is_valid())
     return GURL(chrome::kChromeUINewTabURL);
   return home_page;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
 
 // TODO(adriansc): Remove this method once refactoring changed all call sites.
@@ skipping 2522 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }