Chromium Code Reviews| Index: extensions/browser/api/document_scan/document_scan_interface.h |
| diff --git a/chrome/browser/extensions/api/document_scan/document_scan_interface.h b/extensions/browser/api/document_scan/document_scan_interface.h |
| similarity index 66% |
| rename from chrome/browser/extensions/api/document_scan/document_scan_interface.h |
| rename to extensions/browser/api/document_scan/document_scan_interface.h |
| index 675e097bf6c9d18a224d394a940f51010c7662b0..635e7ec34ba0b2055793870a0a1f2a81c5f7ab75 100644 |
| --- a/chrome/browser/extensions/api/document_scan/document_scan_interface.h |
| +++ b/extensions/browser/api/document_scan/document_scan_interface.h |
| @@ -8,12 +8,12 @@ |
| #include "base/callback.h" |
| #include "base/memory/scoped_ptr.h" |
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |
| -#define CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |
| +#ifndef EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |
|
James Cook
2015/02/05 19:02:59
move to top of file
babu
2015/02/05 21:34:03
Done.
|
| +#define EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |
| namespace extensions { |
| -namespace api { |
| +namespace core_api { |
| class DocumentScanInterface { |
| public: |
| @@ -27,20 +27,15 @@ class DocumentScanInterface { |
| std::string image_mime_type; |
| }; |
| - enum ScanMode { |
| - kScanModeColor, |
| - kScanModeGray, |
| - kScanModeLineart |
| - }; |
| + enum ScanMode { kScanModeColor, kScanModeGray, kScanModeLineart }; |
| typedef base::Callback<void( |
| const std::vector<ScannerDescription>& scanner_descriptions, |
| const std::string& error)> ListScannersResultsCallback; |
| - typedef base::Callback<void( |
| - const std::string& scanned_image, |
| - const std::string& mime_type, |
| - const std::string& error)> ScanResultsCallback; |
| + typedef base::Callback<void(const std::string& scanned_image, |
| + const std::string& mime_type, |
| + const std::string& error)> ScanResultsCallback; |
| virtual ~DocumentScanInterface(); |
| @@ -51,14 +46,14 @@ class DocumentScanInterface { |
| virtual void ListScanners(const ListScannersResultsCallback& callback) = 0; |
| // Creates a platform-specific DocumentScanInterface instance. |
| - static DocumentScanInterface *CreateInstance(); |
| + static DocumentScanInterface* CreateInstance(); |
| protected: |
| DocumentScanInterface(); |
| }; |
| -} // namespace api |
| +} // namespace core_api |
| } // namespace extensions |
| -#endif // CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |
| +#endif // EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_H_ |