Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 1602403002: Revert of Remove remote tree host and some related input and metro_driver code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-3
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 // Do nothing if there is already a running enable flow. 772 // Do nothing if there is already a running enable flow.
773 if (extension_enable_flow_) 773 if (extension_enable_flow_)
774 return; 774 return;
775 775
776 extension_enable_flow_.reset( 776 extension_enable_flow_.reset(
777 new ExtensionEnableFlow(profile_, app_id, this)); 777 new ExtensionEnableFlow(profile_, app_id, this));
778 extension_enable_flow_->StartForNativeWindow(NULL); 778 extension_enable_flow_->StartForNativeWindow(NULL);
779 return; 779 return;
780 } 780 }
781 781
782 #if defined(OS_WIN)
783 if (LaunchedInNativeDesktop(app_id))
784 return;
785 #endif
786
782 // The app will be created for the currently active profile. 787 // The app will be created for the currently active profile.
783 AppLaunchParams params( 788 AppLaunchParams params(
784 profile_, extension, ui::DispositionFromEventFlags(event_flags), 789 profile_, extension, ui::DispositionFromEventFlags(event_flags),
785 chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER); 790 chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER);
786 if (source != ash::LAUNCH_FROM_UNKNOWN && 791 if (source != ash::LAUNCH_FROM_UNKNOWN &&
787 app_id == extensions::kWebStoreAppId) { 792 app_id == extensions::kWebStoreAppId) {
788 // Get the corresponding source string. 793 // Get the corresponding source string.
789 std::string source_value = GetSourceFromAppListSource(source); 794 std::string source_value = GetSourceFromAppListSource(source);
790 795
791 // Set an override URL to include the source. 796 // Set an override URL to include the source.
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2226 void ChromeLauncherController::ReleaseProfile() { 2231 void ChromeLauncherController::ReleaseProfile() {
2227 if (app_sync_ui_state_) 2232 if (app_sync_ui_state_)
2228 app_sync_ui_state_->RemoveObserver(this); 2233 app_sync_ui_state_->RemoveObserver(this);
2229 2234
2230 extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this); 2235 extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
2231 2236
2232 PrefServiceSyncableFromProfile(profile_)->RemoveObserver(this); 2237 PrefServiceSyncableFromProfile(profile_)->RemoveObserver(this);
2233 2238
2234 pref_change_registrar_.RemoveAll(); 2239 pref_change_registrar_.RemoveAll();
2235 } 2240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698