#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/metrics/user_metrics.h"
#include "base/stl_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile_info_cache.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/app_list/extension_app_model_builder.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
#include "chrome/browser/ui/app_list/search/search_controller.h"
#include "chrome/browser/ui/app_list/start_page_service.h"
#include "chrome/browser/ui/browser_finder.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/page_navigator.h"
#include "content/public/browser/user_metrics.h"
+#include "grit/theme_resources.h"
+#include "ui/app_list/app_list_view_delegate_observer.h"
#include "ui/app_list/search_box_model.h"
+#include "ui/app_list/speech_ui_model.h"
+#include "ui/base/resource/resource_bundle.h"
#if defined(USE_ASH)
#include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
namespace {
+const int kAutoLaunchDefaultTimeoutMilliSec = 50;
+
#if defined(OS_WIN)
void CreateShortcutInWebAppDir(
const base::FilePath& app_data_dir,
void PopulateUsers(const ProfileInfoCache& profile_info,
const base::FilePath& active_profile_path,
- app_list::AppListModel::Users* users) {
+ app_list::AppListViewDelegate::Users* users) {
+ users->clear();
const size_t count = profile_info.GetNumberOfProfiles();
for (size_t i = 0; i < count; ++i) {
// Don't display managed users.
if (profile_info.ProfileIsManagedAtIndex(i))
continue;
- app_list::AppListModel::User user;
+ app_list::AppListViewDelegate::User user;
user.name = profile_info.GetNameOfProfileAtIndex(i);
user.email = profile_info.GetUserNameOfProfileAtIndex(i);
user.profile_path = profile_info.GetPathOfProfileAtIndex(i);
} // namespace
-AppListViewDelegate::AppListViewDelegate(
- scoped_ptr<AppListControllerDelegate> controller,
- Profile* profile)
- : controller_(controller.Pass()),
+AppListViewDelegate::AppListViewDelegate(Profile* profile,
+ AppListControllerDelegate* controller)
+ : controller_(controller),
profile_(profile),
model_(NULL) {
CHECK(controller_);
RegisterForNotifications();
g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+
+ app_list::StartPageService* service =
+ app_list::StartPageService::Get(profile_);
+ speech_ui_.reset(new app_list::SpeechUIModel(
+ service ? service->state() : app_list::SPEECH_RECOGNITION_OFF));
+
+#if defined(GOOGLE_CHROME_BUILD)
+ speech_ui_->set_logo(
+ *ui::ResourceBundle::GetSharedInstance().
+ GetImageSkiaNamed(IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH));
+#endif
+
+ OnProfileChanged(); // sets model_
+ if (service)
+ service->AddObserver(this);
}
AppListViewDelegate::~AppListViewDelegate() {
+ app_list::StartPageService* service =
+ app_list::StartPageService::Get(profile_);
+ if (service)
+ service->RemoveObserver(this);
g_browser_process->
profile_manager()->GetProfileInfoCache().RemoveObserver(this);
+ // Ensure search controller is released prior to speech_ui_.
+ search_controller_.reset();
}
void AppListViewDelegate::RegisterForNotifications() {
}
void AppListViewDelegate::OnProfileChanged() {
- CHECK(controller_);
+ model_ = app_list::AppListSyncableServiceFactory::GetForProfile(
+ profile_)->model();
+
search_controller_.reset(new app_list::SearchController(
- profile_, model_->search_box(), model_->results(), controller_.get()));
+ profile_, model_->search_box(), model_->results(),
+ speech_ui_.get(), controller_));
signin_delegate_.SetProfile(profile_);
app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_, model_));
#endif
- model_->SetSignedIn(!GetSigninDelegate()->NeedSignin());
-
// Don't populate the app list users if we are on the ash desktop.
chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
controller_->GetAppListWindow());
return;
// Populate the app list users.
- app_list::AppListModel::Users users;
PopulateUsers(g_browser_process->profile_manager()->GetProfileInfoCache(),
- profile_->GetPath(), &users);
- model_->SetUsers(users);
+ profile_->GetPath(), &users_);
+
+ FOR_EACH_OBSERVER(app_list::AppListViewDelegateObserver,
+ observers_,
+ OnProfilesChanged());
}
bool AppListViewDelegate::ForceNativeDesktop() const {
RegisterForNotifications();
- apps_builder_->SwitchProfile(profile_);
-
OnProfileChanged();
// Clear search query.
model_->search_box()->SetText(base::string16());
}
-void AppListViewDelegate::InitModel(app_list::AppListModel* model) {
- DCHECK(!model_);
- DCHECK(model);
- model_ = model;
-
- // Initialize apps model.
- apps_builder_.reset(new ExtensionAppModelBuilder(profile_,
- model,
- controller_.get()));
-
- // Initialize the profile information in the app list menu.
- OnProfileChanged();
+app_list::AppListModel* AppListViewDelegate::GetModel() {
+ return model_;
}
app_list::SigninDelegate* AppListViewDelegate::GetSigninDelegate() {
return &signin_delegate_;
}
+app_list::SpeechUIModel* AppListViewDelegate::GetSpeechUI() {
+ return speech_ui_.get();
+}
+
void AppListViewDelegate::GetShortcutPathForApp(
const std::string& app_id,
const base::Callback<void(const base::FilePath&)>& callback) {
void AppListViewDelegate::OpenSearchResult(
app_list::SearchResult* result,
+ bool auto_launch,
int event_flags) {
+ if (auto_launch)
+ base::RecordAction(base::UserMetricsAction("AppList_AutoLaunched"));
search_controller_->OpenResult(result, event_flags);
}
search_controller_->InvokeResultAction(result, action_index, event_flags);
}
+base::TimeDelta AppListViewDelegate::GetAutoLaunchTimeout() {
+ return auto_launch_timeout_;
+}
+
+void AppListViewDelegate::AutoLaunchCanceled() {
+ base::RecordAction(base::UserMetricsAction("AppList_AutoLaunchCanceled"));
+ auto_launch_timeout_ = base::TimeDelta();
+}
+
+void AppListViewDelegate::ViewInitialized() {
+ content::WebContents* contents = GetSpeechRecognitionContents();
+ if (contents) {
+ contents->GetWebUI()->CallJavascriptFunction(
+ "appList.startPage.onAppListShown");
+ }
+}
+
void AppListViewDelegate::Dismiss() {
controller_->DismissView();
}
void AppListViewDelegate::ViewClosing() {
controller_->ViewClosing();
+
+ content::WebContents* contents = GetSpeechRecognitionContents();
+ if (contents) {
+ contents->GetWebUI()->CallJavascriptFunction(
+ "appList.startPage.onAppListHidden");
+ }
}
gfx::ImageSkia AppListViewDelegate::GetWindowIcon() {
chrome::kAppLauncherCategoryTag);
}
+void AppListViewDelegate::ToggleSpeechRecognition() {
+ app_list::StartPageService* service =
+ app_list::StartPageService::Get(profile_);
+ if (service)
+ service->ToggleSpeechRecognition();
+}
+
void AppListViewDelegate::ShowForProfileByPath(
const base::FilePath& profile_path) {
controller_->ShowForProfileByPath(profile_path);
}
+void AppListViewDelegate::OnSpeechResult(const base::string16& result,
+ bool is_final) {
+ speech_ui_->SetSpeechResult(result, is_final);
+ if (is_final) {
+ auto_launch_timeout_ = base::TimeDelta::FromMilliseconds(
+ kAutoLaunchDefaultTimeoutMilliSec);
+ model_->search_box()->SetText(result);
+ }
+}
+
+void AppListViewDelegate::OnSpeechSoundLevelChanged(int16 level) {
+ speech_ui_->UpdateSoundLevel(level);
+}
+
+void AppListViewDelegate::OnSpeechRecognitionStateChanged(
+ app_list::SpeechRecognitionState new_state) {
+ speech_ui_->SetSpeechRecognitionState(new_state);
+}
+
void AppListViewDelegate::Observe(
int type,
const content::NotificationSource& source,
if (!service)
return NULL;
- return service->contents();
+ return service->GetStartPageContents();
+}
+
+content::WebContents* AppListViewDelegate::GetSpeechRecognitionContents() {
+ app_list::StartPageService* service =
+ app_list::StartPageService::Get(profile_);
+ if (!service)
+ return NULL;
+
+ return service->GetSpeechRecognitionContents();
+}
+
+const app_list::AppListViewDelegate::Users&
+AppListViewDelegate::GetUsers() const {
+ return users_;
+}
+
+void AppListViewDelegate::AddObserver(
+ app_list::AppListViewDelegateObserver* observer) {
+ observers_.AddObserver(observer);
+}
+
+void AppListViewDelegate::RemoveObserver(
+ app_list::AppListViewDelegateObserver* observer) {
+ observers_.RemoveObserver(observer);
}
projects / platform / framework / web / crosswalk.git / blobdiff