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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
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.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 9 #include "base/command_line.h"
11 #include "base/file_path.h" 10 #include "base/file_path.h"
12 #include "base/file_util.h" 11 #include "base/file_util.h"
13 #include "base/path_service.h" 12 #include "base/path_service.h"
14 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
15 #include "base/string_util.h" 14 #include "base/string_util.h"
16 #include "chrome/browser/background_contents_service.h" 15 #include "chrome/browser/background_contents_service.h"
17 #include "chrome/browser/browser_list.h" 16 #include "chrome/browser/browser_list.h"
18 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/browser_thread.h" 18 #include "chrome/browser/browser_thread.h"
(...skipping 11 matching lines...) Expand all
31 #include "chrome/browser/ui/find_bar/find_bar_state.h" 30 #include "chrome/browser/ui/find_bar/find_bar_state.h"
32 #include "chrome/common/chrome_constants.h" 31 #include "chrome/common/chrome_constants.h"
33 #include "chrome/common/chrome_paths.h" 32 #include "chrome/common/chrome_paths.h"
34 #include "chrome/common/json_pref_store.h" 33 #include "chrome/common/json_pref_store.h"
35 #include "chrome/common/notification_service.h" 34 #include "chrome/common/notification_service.h"
36 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
37 #include "chrome/common/render_messages.h" 36 #include "chrome/common/render_messages.h"
38 #include "grit/browser_resources.h" 37 #include "grit/browser_resources.h"
39 #include "grit/locale_settings.h" 38 #include "grit/locale_settings.h"
40 #include "net/base/transport_security_state.h" 39 #include "net/base/transport_security_state.h"
40 #include "ui/base/resource/resource_bundle.h"
41 #include "webkit/database/database_tracker.h" 41 #include "webkit/database/database_tracker.h"
42 42
43 #if defined(TOOLKIT_USES_GTK) 43 #if defined(TOOLKIT_USES_GTK)
44 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 44 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
45 #endif 45 #endif
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #include "chrome/browser/password_manager/password_store_win.h" 48 #include "chrome/browser/password_manager/password_store_win.h"
49 #elif defined(OS_MACOSX) 49 #elif defined(OS_MACOSX)
50 #include "chrome/browser/keychain_mac.h" 50 #include "chrome/browser/keychain_mac.h"
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 682
683 // The file_system context for this profile. 683 // The file_system context for this profile.
684 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_; 684 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
685 685
686 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 686 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
687 }; 687 };
688 688
689 Profile* Profile::CreateOffTheRecordProfile() { 689 Profile* Profile::CreateOffTheRecordProfile() {
690 return new OffTheRecordProfileImpl(this); 690 return new OffTheRecordProfileImpl(this);
691 } 691 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/cloud_print/cloud_print_setup_source.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698