| Index: extensions/browser/api/document_scan/document_scan_interface_chromeos.h
|
| diff --git a/chrome/browser/extensions/api/document_scan/document_scan_interface_chromeos.h b/extensions/browser/api/document_scan/document_scan_interface_chromeos.h
|
| similarity index 69%
|
| rename from chrome/browser/extensions/api/document_scan/document_scan_interface_chromeos.h
|
| rename to extensions/browser/api/document_scan/document_scan_interface_chromeos.h
|
| index 5c658a8aa30e582942fbb39306d1de6c5b2d8973..cd50d508f4ae674ddd85936f4ca11b08d89ed7d9 100644
|
| --- a/chrome/browser/extensions/api/document_scan/document_scan_interface_chromeos.h
|
| +++ b/extensions/browser/api/document_scan/document_scan_interface_chromeos.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
| +#ifndef EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
| +#define EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
|
|
| -#include "chrome/browser/extensions/api/document_scan/document_scan_interface.h"
|
| +#include "extensions/browser/api/document_scan/document_scan_interface.h"
|
| #include "chromeos/dbus/lorgnette_manager_client.h"
|
|
|
| namespace extensions {
|
|
|
| -namespace api {
|
| +namespace core_api {
|
|
|
| class DocumentScanInterfaceChromeos : public DocumentScanInterface {
|
| public:
|
| @@ -29,8 +29,8 @@ class DocumentScanInterfaceChromeos : public DocumentScanInterface {
|
| void OnScannerListReceived(
|
| const ListScannersResultsCallback& callback,
|
| bool succeeded,
|
| - const chromeos::LorgnetteManagerClient::ScannerTable &scanners);
|
| - void OnScanCompleted(const ScanResultsCallback &callback,
|
| + const chromeos::LorgnetteManagerClient::ScannerTable& scanners);
|
| + void OnScanCompleted(const ScanResultsCallback& callback,
|
| bool succeeded,
|
| const std::string& image_data);
|
| chromeos::LorgnetteManagerClient* GetLorgnetteManagerClient();
|
| @@ -41,8 +41,8 @@ class DocumentScanInterfaceChromeos : public DocumentScanInterface {
|
| DISALLOW_COPY_AND_ASSIGN(DocumentScanInterfaceChromeos);
|
| };
|
|
|
| -} // namespace api
|
| +} // namespace core_api
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
| +#endif // EXTENSIONS_BROWSER_API_DOCUMENT_SCAN_DOCUMENT_SCAN_INTERFACE_CHROMEOS_H_
|
|
|