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

Side by Side Diff: chrome/browser/profiles/profile_impl.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_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 7 #include "base/command_line.h"
9 #include "base/environment.h" 8 #include "base/environment.h"
10 #include "base/file_path.h" 9 #include "base/file_path.h"
11 #include "base/file_util.h" 10 #include "base/file_util.h"
12 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.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_number_conversions.h" 14 #include "base/string_number_conversions.h"
16 #include "base/string_util.h" 15 #include "base/string_util.h"
17 #include "chrome/browser/about_flags.h" 16 #include "chrome/browser/about_flags.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "chrome/common/chrome_paths.h" 85 #include "chrome/common/chrome_paths.h"
87 #include "chrome/common/chrome_paths_internal.h" 86 #include "chrome/common/chrome_paths_internal.h"
88 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
89 #include "chrome/common/json_pref_store.h" 88 #include "chrome/common/json_pref_store.h"
90 #include "chrome/common/notification_service.h" 89 #include "chrome/common/notification_service.h"
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "chrome/common/render_messages.h" 91 #include "chrome/common/render_messages.h"
93 #include "grit/browser_resources.h" 92 #include "grit/browser_resources.h"
94 #include "grit/locale_settings.h" 93 #include "grit/locale_settings.h"
95 #include "net/base/transport_security_state.h" 94 #include "net/base/transport_security_state.h"
95 #include "ui/base/resource/resource_bundle.h"
96 #include "webkit/database/database_tracker.h" 96 #include "webkit/database/database_tracker.h"
97 97
98 #if defined(TOOLKIT_USES_GTK) 98 #if defined(TOOLKIT_USES_GTK)
99 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 99 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
100 #endif 100 #endif
101 101
102 #if defined(OS_WIN) 102 #if defined(OS_WIN)
103 #include "chrome/browser/instant/promo_counter.h" 103 #include "chrome/browser/instant/promo_counter.h"
104 #include "chrome/browser/password_manager/password_store_win.h" 104 #include "chrome/browser/password_manager/password_store_win.h"
105 #include "chrome/installer/util/install_util.h" 105 #include "chrome/installer/util/install_util.h"
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 } 1389 }
1390 1390
1391 PrerenderManager* ProfileImpl::GetPrerenderManager() { 1391 PrerenderManager* ProfileImpl::GetPrerenderManager() {
1392 CommandLine* cl = CommandLine::ForCurrentProcess(); 1392 CommandLine* cl = CommandLine::ForCurrentProcess();
1393 if (!cl->HasSwitch(switches::kEnablePagePrerender)) 1393 if (!cl->HasSwitch(switches::kEnablePagePrerender))
1394 return NULL; 1394 return NULL;
1395 if (!prerender_manager_) 1395 if (!prerender_manager_)
1396 prerender_manager_ = new PrerenderManager(this); 1396 prerender_manager_ = new PrerenderManager(this);
1397 return prerender_manager_; 1397 return prerender_manager_;
1398 } 1398 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/remoting/remoting_resources_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698