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

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

Issue 7517016: Add prerender to ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add prerender_condition.h and OVERRIDE 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
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) 114 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
115 #include "base/nix/xdg_util.h" 115 #include "base/nix/xdg_util.h"
116 #if defined(USE_GNOME_KEYRING) 116 #if defined(USE_GNOME_KEYRING)
117 #include "chrome/browser/password_manager/native_backend_gnome_x.h" 117 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
118 #endif 118 #endif
119 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" 119 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
120 #include "chrome/browser/password_manager/password_store_x.h" 120 #include "chrome/browser/password_manager/password_store_x.h"
121 #endif 121 #endif
122 122
123 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
124 #include "chrome/browser/chromeos/cros/cros_library.h"
124 #include "chrome/browser/chromeos/locale_change_guard.h" 125 #include "chrome/browser/chromeos/locale_change_guard.h"
125 #include "chrome/browser/chromeos/login/user_manager.h" 126 #include "chrome/browser/chromeos/login/user_manager.h"
126 #include "chrome/browser/chromeos/preferences.h" 127 #include "chrome/browser/chromeos/preferences.h"
128 #include "chrome/browser/chromeos/prerender_condition_network.h"
127 #endif 129 #endif
128 130
129 using base::Time; 131 using base::Time;
130 using base::TimeDelta; 132 using base::TimeDelta;
131 133
132 namespace { 134 namespace {
133 135
134 // Delay, in milliseconds, before we explicitly create the SessionService. 136 // Delay, in milliseconds, before we explicitly create the SessionService.
135 static const int kCreateSessionServiceDelayMS = 500; 137 static const int kCreateSessionServiceDelayMS = 500;
136 138
(...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1714 } 1716 }
1715 1717
1716 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1718 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1717 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1719 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1718 return NULL; 1720 return NULL;
1719 if (!prerender_manager_.get()) { 1721 if (!prerender_manager_.get()) {
1720 CHECK(g_browser_process->prerender_tracker()); 1722 CHECK(g_browser_process->prerender_tracker());
1721 prerender_manager_.reset( 1723 prerender_manager_.reset(
1722 new prerender::PrerenderManager( 1724 new prerender::PrerenderManager(
1723 this, g_browser_process->prerender_tracker())); 1725 this, g_browser_process->prerender_tracker()));
1726 #if defined(OS_CHROMEOS)
1727 prerender_manager_->AddCondition(
1728 new chromeos::PrerenderConditionNetwork(
1729 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
1730 #endif
1724 } 1731 }
1725 return prerender_manager_.get(); 1732 return prerender_manager_.get();
1726 } 1733 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698