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

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

Issue 270383007: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // Do nothing if there is already a running enable flow. 643 // Do nothing if there is already a running enable flow.
644 if (extension_enable_flow_) 644 if (extension_enable_flow_)
645 return; 645 return;
646 646
647 extension_enable_flow_.reset( 647 extension_enable_flow_.reset(
648 new ExtensionEnableFlow(profile_, app_id, this)); 648 new ExtensionEnableFlow(profile_, app_id, this));
649 extension_enable_flow_->StartForNativeWindow(NULL); 649 extension_enable_flow_->StartForNativeWindow(NULL);
650 return; 650 return;
651 } 651 }
652 652
653 #if defined(OS_WIN)
653 if (LaunchedInNativeDesktop(app_id)) 654 if (LaunchedInNativeDesktop(app_id))
654 return; 655 return;
656 #endif
655 657
656 // The app will be created for the currently active profile. 658 // The app will be created for the currently active profile.
657 AppLaunchParams params(profile_, 659 AppLaunchParams params(profile_,
658 extension, 660 extension,
659 event_flags, 661 event_flags,
660 chrome::HOST_DESKTOP_TYPE_ASH); 662 chrome::HOST_DESKTOP_TYPE_ASH);
661 if (source != ash::LAUNCH_FROM_UNKNOWN && 663 if (source != ash::LAUNCH_FROM_UNKNOWN &&
662 app_id == extension_misc::kWebStoreAppId) { 664 app_id == extension_misc::kWebStoreAppId) {
663 // Get the corresponding source string. 665 // Get the corresponding source string.
664 std::string source_value = GetSourceFromAppListSource(source); 666 std::string source_value = GetSourceFromAppListSource(source);
(...skipping 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 } 2005 }
2004 2006
2005 void ChromeLauncherController::ReleaseProfile() { 2007 void ChromeLauncherController::ReleaseProfile() {
2006 if (app_sync_ui_state_) 2008 if (app_sync_ui_state_)
2007 app_sync_ui_state_->RemoveObserver(this); 2009 app_sync_ui_state_->RemoveObserver(this);
2008 2010
2009 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); 2011 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
2010 2012
2011 pref_change_registrar_.RemoveAll(); 2013 pref_change_registrar_.RemoveAll();
2012 } 2014 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698