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

Unified Diff: chrome/browser/ui/browser.cc

Issue 9702035: Revert 126700 because it broke clang on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | ui/resources/aura/status_less.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc (revision 126705)
+++ chrome/browser/ui/browser.cc (working copy)
@@ -641,7 +641,7 @@
// Browser, Creation Helpers:
// static
-Browser* Browser::NewEmptyWindow(Profile* profile) {
+void Browser::NewEmptyWindow(Profile* profile) {
bool incognito = profile->IsOffTheRecord();
PrefService* prefs = profile->GetPrefs();
if (incognito) {
@@ -659,25 +659,23 @@
if (incognito) {
content::RecordAction(UserMetricsAction("NewIncognitoWindow"));
- return OpenEmptyWindow(profile->GetOffTheRecordProfile());
+ OpenEmptyWindow(profile->GetOffTheRecordProfile());
} else {
content::RecordAction(UserMetricsAction("NewWindow"));
SessionService* session_service =
SessionServiceFactory::GetForProfile(profile->GetOriginalProfile());
if (!session_service ||
!session_service->RestoreIfNecessary(std::vector<GURL>())) {
- return OpenEmptyWindow(profile->GetOriginalProfile());
+ OpenEmptyWindow(profile->GetOriginalProfile());
}
}
- return NULL;
}
// static
-Browser* Browser::OpenEmptyWindow(Profile* profile) {
+void Browser::OpenEmptyWindow(Profile* profile) {
Browser* browser = Browser::Create(profile);
browser->AddBlankTab(true);
browser->window()->Show();
- return browser;
}
// static
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | ui/resources/aura/status_less.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698