summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles/profile.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/profiles/profile.cc')
-rw-r--r--chrome/browser/profiles/profile.cc38
1 files changed, 4 insertions, 34 deletions
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index da60cab..c8e5433 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -6,48 +6,23 @@
#include <string>
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/off_the_record_profile_io_data.h"
-#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/sync_prefs.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/json_pref_store.h"
#include "chrome/common/pref_names.h"
-#include "chrome/common/render_messages.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_manager.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
-#include "ui/base/resource/resource_bundle.h"
-using base::Time;
-using base::TimeDelta;
+#if defined(OS_CHROMEOS)
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#endif
// A pointer to the request context for the default profile. See comments on
// Profile::GetDefaultRequestContext.
net::URLRequestContextGetter* Profile::default_request_context_;
-namespace {
-
-} // namespace
-
Profile::Profile()
: restored_last_session_(false),
accessibility_pause_level_(0) {
@@ -61,11 +36,6 @@ Profile* Profile::FromBrowserContext(content::BrowserContext* browser_context) {
// static
Profile* Profile::FromWebUI(content::WebUI* web_ui) {
- // TODO(dhollowa): Crash diagnosis http://crbug.com/97802
- CHECK(web_ui);
- CHECK(web_ui->GetWebContents());
- CHECK(web_ui->GetWebContents()->GetBrowserContext());
-
return FromBrowserContext(web_ui->GetWebContents()->GetBrowserContext());
}