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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 7346024: Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 host_content_settings_map_->ShutdownOnUIThread(); 674 host_content_settings_map_->ShutdownOnUIThread();
675 675
676 // This causes the Preferences file to be written to disk. 676 // This causes the Preferences file to be written to disk.
677 MarkAsCleanShutdown(); 677 MarkAsCleanShutdown();
678 } 678 }
679 679
680 std::string ProfileImpl::GetProfileName() { 680 std::string ProfileImpl::GetProfileName() {
681 return GetPrefs()->GetString(prefs::kGoogleServicesUsername); 681 return GetPrefs()->GetString(prefs::kGoogleServicesUsername);
682 } 682 }
683 683
684 ProfileId ProfileImpl::GetRuntimeId() {
685 return reinterpret_cast<ProfileId>(this);
686 }
687
688 FilePath ProfileImpl::GetPath() { 684 FilePath ProfileImpl::GetPath() {
689 return path_; 685 return path_;
690 } 686 }
691 687
692 bool ProfileImpl::IsOffTheRecord() { 688 bool ProfileImpl::IsOffTheRecord() {
693 return false; 689 return false;
694 } 690 }
695 691
696 Profile* ProfileImpl::GetOffTheRecordProfile() { 692 Profile* ProfileImpl::GetOffTheRecordProfile() {
697 if (!off_the_record_profile_.get()) { 693 if (!off_the_record_profile_.get()) {
(...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1648 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1653 return NULL; 1649 return NULL;
1654 if (!prerender_manager_.get()) { 1650 if (!prerender_manager_.get()) {
1655 CHECK(g_browser_process->prerender_tracker()); 1651 CHECK(g_browser_process->prerender_tracker());
1656 prerender_manager_.reset( 1652 prerender_manager_.reset(
1657 new prerender::PrerenderManager( 1653 new prerender::PrerenderManager(
1658 this, g_browser_process->prerender_tracker())); 1654 this, g_browser_process->prerender_tracker()));
1659 } 1655 }
1660 return prerender_manager_.get(); 1656 return prerender_manager_.get();
1661 } 1657 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698