OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/views/app_list/win/app_list_service_win.h" | 5 #include "chrome/browser/ui/views/app_list/win/app_list_service_win.h" |
6 | 6 |
7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
8 #include <sstream> | 8 #include <sstream> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 21 matching lines...) Expand all Loading... | |
32 #include "chrome/browser/ui/views/app_list/win/app_list_win.h" | 32 #include "chrome/browser/ui/views/app_list/win/app_list_win.h" |
33 #include "chrome/browser/web_applications/web_app.h" | 33 #include "chrome/browser/web_applications/web_app.h" |
34 #include "chrome/common/chrome_constants.h" | 34 #include "chrome/common/chrome_constants.h" |
35 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
36 #include "chrome/common/chrome_version_info.h" | 36 #include "chrome/common/chrome_version_info.h" |
37 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
38 #include "chrome/installer/util/browser_distribution.h" | 38 #include "chrome/installer/util/browser_distribution.h" |
39 #include "content/public/browser/browser_thread.h" | 39 #include "content/public/browser/browser_thread.h" |
40 #include "ui/app_list/views/app_list_view.h" | 40 #include "ui/app_list/views/app_list_view.h" |
41 #include "ui/base/win/shell.h" | 41 #include "ui/base/win/shell.h" |
42 #include "ui/base/ui_base_switches.h" | |
42 | 43 |
43 #if defined(GOOGLE_CHROME_BUILD) | 44 #if defined(GOOGLE_CHROME_BUILD) |
44 #include "chrome/installer/util/google_update_settings.h" | 45 #include "chrome/installer/util/google_update_settings.h" |
45 #include "chrome/installer/util/install_util.h" | 46 #include "chrome/installer/util/install_util.h" |
46 #include "chrome/installer/util/updating_app_registration_data.h" | 47 #include "chrome/installer/util/updating_app_registration_data.h" |
47 #include "chrome/installer/util/util_constants.h" | 48 #include "chrome/installer/util/util_constants.h" |
48 #endif // GOOGLE_CHROME_BUILD | 49 #endif // GOOGLE_CHROME_BUILD |
49 | 50 |
50 // static | 51 // static |
51 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) { | 52 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) { |
52 if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) | 53 if ((desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) || |
54 (CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect))) | |
tapted
2014/10/09 22:33:09
This doesn't look right. Clicking the taskbar app
ananta
2014/10/09 22:55:02
Creating a desktop environment breaks IME support
| |
53 return AppListServiceAsh::GetInstance(); | 55 return AppListServiceAsh::GetInstance(); |
54 | 56 |
55 return AppListServiceWin::GetInstance(); | 57 return AppListServiceWin::GetInstance(); |
56 } | 58 } |
57 | 59 |
58 // static | 60 // static |
59 void AppListService::InitAll(Profile* initial_profile) { | 61 void AppListService::InitAll(Profile* initial_profile) { |
60 AppListServiceAsh::GetInstance()->Init(initial_profile); | 62 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect)) { |
61 AppListServiceWin::GetInstance()->Init(initial_profile); | 63 AppListServiceAsh::GetInstance()->Init(initial_profile); |
64 } else { | |
tapted
2014/10/09 22:33:09
Bringing up the Ash service conditionally is proba
| |
65 AppListServiceWin::GetInstance()->Init(initial_profile); | |
66 } | |
62 } | 67 } |
63 | 68 |
64 namespace { | 69 namespace { |
65 | 70 |
66 // Migrate chrome::kAppLauncherIsEnabled pref to | 71 // Migrate chrome::kAppLauncherIsEnabled pref to |
67 // chrome::kAppLauncherHasBeenEnabled pref. | 72 // chrome::kAppLauncherHasBeenEnabled pref. |
68 void MigrateAppLauncherEnabledPref() { | 73 void MigrateAppLauncherEnabledPref() { |
69 PrefService* prefs = g_browser_process->local_state(); | 74 PrefService* prefs = g_browser_process->local_state(); |
70 if (prefs->HasPrefPath(prefs::kAppLauncherIsEnabled)) { | 75 if (prefs->HasPrefPath(prefs::kAppLauncherIsEnabled)) { |
71 prefs->SetBoolean(prefs::kAppLauncherHasBeenEnabled, | 76 prefs->SetBoolean(prefs::kAppLauncherHasBeenEnabled, |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 activation_tracker_.reset(new ActivationTrackerWin(this)); | 387 activation_tracker_.reset(new ActivationTrackerWin(this)); |
383 } | 388 } |
384 | 389 |
385 void AppListServiceWin::OnViewDismissed() { | 390 void AppListServiceWin::OnViewDismissed() { |
386 activation_tracker_->OnViewHidden(); | 391 activation_tracker_->OnViewHidden(); |
387 } | 392 } |
388 | 393 |
389 void AppListServiceWin::MoveNearCursor(app_list::AppListView* view) { | 394 void AppListServiceWin::MoveNearCursor(app_list::AppListView* view) { |
390 AppListWin::MoveNearCursor(view); | 395 AppListWin::MoveNearCursor(view); |
391 } | 396 } |
OLD | NEW |