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

Side by Side Diff: chrome/browser/memory/tab_manager.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
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 #include "chrome/browser/memory/tab_manager.h" 5 #include "chrome/browser/memory/tab_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "components/metrics/system_memory_stats_recorder.h" 48 #include "components/metrics/system_memory_stats_recorder.h"
49 #include "components/variations/variations_associated_data.h" 49 #include "components/variations/variations_associated_data.h"
50 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
51 #include "content/public/browser/memory_pressure_controller.h" 51 #include "content/public/browser/memory_pressure_controller.h"
52 #include "content/public/browser/navigation_controller.h" 52 #include "content/public/browser/navigation_controller.h"
53 #include "content/public/browser/render_process_host.h" 53 #include "content/public/browser/render_process_host.h"
54 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
55 #include "content/public/common/page_importance_signals.h" 55 #include "content/public/common/page_importance_signals.h"
56 56
57 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
58 #include "ash/multi_profile_uma.h" 58 #include "ash/common/multi_profile_uma.h"
59 #include "ash/wm_shell.h" 59 #include "ash/common/wm_shell.h"
60 #include "chrome/browser/memory/tab_manager_delegate_chromeos.h" 60 #include "chrome/browser/memory/tab_manager_delegate_chromeos.h"
61 #include "components/user_manager/user_manager.h" 61 #include "components/user_manager/user_manager.h"
62 #endif 62 #endif
63 63
64 using base::TimeDelta; 64 using base::TimeDelta;
65 using base::TimeTicks; 65 using base::TimeTicks;
66 using content::BrowserThread; 66 using content::BrowserThread;
67 using content::WebContents; 67 using content::WebContents;
68 68
69 namespace memory { 69 namespace memory {
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 // platform. 1031 // platform.
1032 std::string allow_multiple_discards = variations::GetVariationParamValue( 1032 std::string allow_multiple_discards = variations::GetVariationParamValue(
1033 features::kAutomaticTabDiscarding.name, "AllowMultipleDiscards"); 1033 features::kAutomaticTabDiscarding.name, "AllowMultipleDiscards");
1034 return (allow_multiple_discards != "true"); 1034 return (allow_multiple_discards != "true");
1035 #else 1035 #else
1036 return false; 1036 return false;
1037 #endif 1037 #endif
1038 } 1038 }
1039 1039
1040 } // namespace memory 1040 } // namespace memory
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698