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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h 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 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_ 5 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
6 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_ 6 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
16 #include "base/lock.h"
17 #include "base/observer_list.h" 16 #include "base/observer_list.h"
18 #include "base/process_util.h" 17 #include "base/process_util.h"
19 #include "base/ref_counted.h" 18 #include "base/ref_counted.h"
20 #include "base/singleton.h" 19 #include "base/singleton.h"
21 #include "base/string16.h" 20 #include "base/string16.h"
22 #include "base/timer.h" 21 #include "base/timer.h"
23 #include "chrome/browser/renderer_host/web_cache_manager.h" 22 #include "chrome/browser/renderer_host/web_cache_manager.h"
24 #include "net/url_request/url_request_job_tracker.h" 23 #include "net/url_request/url_request_job_tracker.h"
25 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" 24 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
26 25
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 // Whether we are currently in the process of updating. 458 // Whether we are currently in the process of updating.
460 UpdateState update_state_; 459 UpdateState update_state_;
461 460
462 // A salt lick for the goats. 461 // A salt lick for the goats.
463 int goat_salt_; 462 int goat_salt_;
464 463
465 DISALLOW_COPY_AND_ASSIGN(TaskManagerModel); 464 DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
466 }; 465 };
467 466
468 #endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_ 467 #endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/thumbnail_generator.h ('k') | chrome/browser/transport_security_persister.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698