| Index: chrome/browser/apps/drive/drive_app_converter.h
|
| diff --git a/chrome/browser/ui/app_list/drive/drive_app_converter.h b/chrome/browser/apps/drive/drive_app_converter.h
|
| similarity index 70%
|
| rename from chrome/browser/ui/app_list/drive/drive_app_converter.h
|
| rename to chrome/browser/apps/drive/drive_app_converter.h
|
| index d153c9f2f710c5241926ce56cfa586bf4fc45717..772ea1e1df2c852bd07fe503120778b7776b2a0d 100644
|
| --- a/chrome/browser/ui/app_list/drive/drive_app_converter.h
|
| +++ b/chrome/browser/apps/drive/drive_app_converter.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_
|
| -#define CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_
|
| +#ifndef CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_
|
| +#define CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_
|
|
|
| #include <string>
|
|
|
| @@ -15,13 +15,13 @@
|
| #include "chrome/browser/extensions/install_observer.h"
|
| #include "chrome/common/web_application_info.h"
|
|
|
| +class Profile;
|
| +
|
| namespace extensions {
|
| class CrxInstaller;
|
| class Extension;
|
| }
|
|
|
| -class Profile;
|
| -
|
| // DriveAppConverter creates and installs a local URL app for the given
|
| // DriveAppInfo into the given profile.
|
| class DriveAppConverter : public extensions::InstallObserver {
|
| @@ -30,14 +30,18 @@ class DriveAppConverter : public extensions::InstallObserver {
|
| FinishedCallback;
|
|
|
| DriveAppConverter(Profile* profile,
|
| - const drive::DriveAppInfo& app_info,
|
| + const drive::DriveAppInfo& drive_app_info,
|
| const FinishedCallback& finished_callback);
|
| virtual ~DriveAppConverter();
|
|
|
| void Start();
|
| + bool IsStarted() const;
|
| +
|
| + bool IsInstalling(const std::string& app_id) const;
|
|
|
| - const drive::DriveAppInfo& app_info() const { return app_info_; }
|
| - const extensions::Extension* app() const { return app_; }
|
| + const drive::DriveAppInfo& drive_app_info() const { return drive_app_info_; }
|
| + const extensions::Extension* extension() const { return extension_; }
|
| + bool is_new_install() const { return is_new_install_; }
|
|
|
| private:
|
| class IconFetcher;
|
| @@ -53,10 +57,11 @@ class DriveAppConverter : public extensions::InstallObserver {
|
| bool success) OVERRIDE;
|
|
|
| Profile* profile_;
|
| - const drive::DriveAppInfo app_info_;
|
| + const drive::DriveAppInfo drive_app_info_;
|
|
|
| WebApplicationInfo web_app_;
|
| - const extensions::Extension* app_;
|
| + const extensions::Extension* extension_;
|
| + bool is_new_install_;
|
|
|
| ScopedVector<IconFetcher> fetchers_;
|
| scoped_refptr<extensions::CrxInstaller> crx_installer_;
|
| @@ -66,4 +71,4 @@ class DriveAppConverter : public extensions::InstallObserver {
|
| DISALLOW_COPY_AND_ASSIGN(DriveAppConverter);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_
|
| +#endif // CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_
|
|
|