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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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/multi_profile_browser_status_monitor.h" 5 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
6 6
7 #include "ash/common/shelf/shelf_item_types.h"
8 #include "ash/common/wm_window.h"
9 #include "ash/public/cpp/window_properties.h" 7 #include "ash/public/cpp/window_properties.h"
8 #include "ash/shelf/shelf_item_types.h"
9 #include "ash/wm_window.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
13 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 13 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_tabstrip.h" 16 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/settings_window_manager.h" 18 #include "chrome/browser/ui/settings_window_manager.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher( 125 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
126 Browser* browser) { 126 Browser* browser) {
127 // Removing a V1 app from the launcher requires to remove the content and 127 // Removing a V1 app from the launcher requires to remove the content and
128 // the launcher item. 128 // the launcher item.
129 launcher_controller_->UpdateAppState( 129 launcher_controller_->UpdateAppState(
130 browser->tab_strip_model()->GetActiveWebContents(), 130 browser->tab_strip_model()->GetActiveWebContents(),
131 ChromeLauncherController::APP_STATE_REMOVED); 131 ChromeLauncherController::APP_STATE_REMOVED);
132 BrowserStatusMonitor::RemoveV1AppFromShelf(browser); 132 BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
133 } 133 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/settings_window_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698