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

Side by Side Diff: chrome/browser/browser_process_impl.h

Issue 1257543004: Add oom tab killing and the about:discards page on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@memoryPressureOnLinux
Patch Set: Created 5 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/browser_process_impl.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_; 306 scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
307 307
308 scoped_ptr<gcm::GCMDriver> gcm_driver_; 308 scoped_ptr<gcm::GCMDriver> gcm_driver_;
309 309
310 scoped_ptr<ChromeChildProcessWatcher> child_process_watcher_; 310 scoped_ptr<ChromeChildProcessWatcher> child_process_watcher_;
311 311
312 #if !defined(OS_ANDROID) 312 #if !defined(OS_ANDROID)
313 scoped_ptr<ChromeDeviceClient> device_client_; 313 scoped_ptr<ChromeDeviceClient> device_client_;
314 #endif 314 #endif
315 315
316 #if defined(OS_WIN) || defined(OS_CHROMEOS) 316 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)
317 // Any change to this #ifdef must be reflected as well in 317 // Any change to this #ifdef must be reflected as well in
318 // chrome/browser/memory/oom_priority_manager_browsertest.cc 318 // chrome/browser/memory/oom_priority_manager_browsertest.cc
319 scoped_ptr<memory::OomPriorityManager> oom_priority_manager_; 319 scoped_ptr<memory::OomPriorityManager> oom_priority_manager_;
320 #endif 320 #endif
321 321
322 ShellIntegration::DefaultWebClientState cached_default_web_client_state_; 322 ShellIntegration::DefaultWebClientState cached_default_web_client_state_;
323 323
324 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 324 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
325 }; 325 };
326 326
327 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 327 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698