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

Side by Side Diff: chrome/browser/printing/print_dialog_cloud_internal.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_ 5 #ifndef CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
6 #define CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_ 6 #define CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/lock.h"
14 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "base/synchronization/lock.h"
15 #include "chrome/browser/dom_ui/dom_ui.h" 15 #include "chrome/browser/dom_ui/dom_ui.h"
16 #include "chrome/browser/dom_ui/html_dialog_ui.h" 16 #include "chrome/browser/dom_ui/html_dialog_ui.h"
17 #include "chrome/common/notification_observer.h" 17 #include "chrome/common/notification_observer.h"
18 #include "chrome/common/notification_registrar.h" 18 #include "chrome/common/notification_registrar.h"
19 19
20 class GURL; 20 class GURL;
21 class StringValue; 21 class StringValue;
22 class CloudPrintHtmlDialogDelegateTest; 22 class CloudPrintHtmlDialogDelegateTest;
23 23
24 namespace internal_cloud_print_helpers { 24 namespace internal_cloud_print_helpers {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void SendPrintDataFile(); 63 void SendPrintDataFile();
64 64
65 // Cancels any ramining part of the task by clearing out the dom_ui 65 // Cancels any ramining part of the task by clearing out the dom_ui
66 // helper_ ptr. 66 // helper_ ptr.
67 void CancelPrintDataFile(); 67 void CancelPrintDataFile();
68 68
69 private: 69 private:
70 friend class base::RefCountedThreadSafe<CloudPrintDataSender>; 70 friend class base::RefCountedThreadSafe<CloudPrintDataSender>;
71 virtual ~CloudPrintDataSender(); 71 virtual ~CloudPrintDataSender();
72 72
73 Lock lock_; 73 base::Lock lock_;
74 CloudPrintDataSenderHelper* volatile helper_; 74 CloudPrintDataSenderHelper* volatile helper_;
75 scoped_ptr<StringValue> print_data_; 75 scoped_ptr<StringValue> print_data_;
76 string16 print_job_title_; 76 string16 print_job_title_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(CloudPrintDataSender); 78 DISALLOW_COPY_AND_ASSIGN(CloudPrintDataSender);
79 }; 79 };
80 80
81 class CloudPrintHtmlDialogDelegate; 81 class CloudPrintHtmlDialogDelegate;
82 82
83 // The CloudPrintFlowHandler connects the state machine (the UI delegate) 83 // The CloudPrintFlowHandler connects the state machine (the UI delegate)
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 // The parameters needed to display a modal HTML dialog. 167 // The parameters needed to display a modal HTML dialog.
168 HtmlDialogUI::HtmlDialogParams params_; 168 HtmlDialogUI::HtmlDialogParams params_;
169 169
170 DISALLOW_COPY_AND_ASSIGN(CloudPrintHtmlDialogDelegate); 170 DISALLOW_COPY_AND_ASSIGN(CloudPrintHtmlDialogDelegate);
171 }; 171 };
172 172
173 } // namespace internal_cloud_print_helpers 173 } // namespace internal_cloud_print_helpers
174 174
175 #endif // CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_ 175 #endif // CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_dialog_cloud.cc ('k') | chrome/browser/printing/print_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698