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

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

Issue 83173007: Fixing M32 crasher where closing of a windowed V1 app on a visiting desktop will cause crashes late… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H_
7 7
8 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" 8 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
9 9
10 // MultiProfileBrowserStatusMonitor uses mainly the BrowserStatusMonitormonitor 10 // MultiProfileBrowserStatusMonitor uses mainly the BrowserStatusMonitormonitor
James Cook 2013/11/22 19:06:09 nit: BrowserStatusMonitormonitor?
Mr4D (OOO till 08-26) 2013/11/22 19:17:00 Done.
11 // with the addition that it creates and destroys launcher items for windowed 11 // with the addition that it creates and destroys launcher items for windowed
12 // V1 apps - upon creation as well as upon user switch. 12 // V1 apps - upon creation as well as upon user switch.
13 class MultiProfileBrowserStatusMonitor : public BrowserStatusMonitor { 13 class MultiProfileBrowserStatusMonitor : public BrowserStatusMonitor {
14 public: 14 public:
15 explicit MultiProfileBrowserStatusMonitor( 15 explicit MultiProfileBrowserStatusMonitor(
16 ChromeLauncherController* launcher_controller); 16 ChromeLauncherController* launcher_controller);
17 virtual ~MultiProfileBrowserStatusMonitor(); 17 virtual ~MultiProfileBrowserStatusMonitor();
18 18
19 // BrowserStatusMonitor overrides. 19 // BrowserStatusMonitor overrides.
20 virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE; 20 virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE;
21 virtual void AddV1AppToShelf(Browser* browser) OVERRIDE; 21 virtual void AddV1AppToShelf(Browser* browser) OVERRIDE;
22 virtual void RemoveV1AppFromShelf(Browser* browser) OVERRIDE; 22 virtual void RemoveV1AppFromShelf(Browser* browser) OVERRIDE;
23 23
24 private: 24 private:
25 typedef std::vector<Browser*> AppList; 25 typedef std::vector<Browser*> AppList;
26 AppList app_list_; 26 AppList app_list_;
27 27
28 // Connect a V1 app to the launcher.
29 void ConnectV1AppToLauncher(Browser* browser);
30
31 // Disconnect a V1 app from the launcher.
32 void DisconnectV1AppFromLauncher(Browser* browser);
33
28 // The launcher controller which is associated with this object. 34 // The launcher controller which is associated with this object.
29 ChromeLauncherController* launcher_controller_; 35 ChromeLauncherController* launcher_controller_;
30 36
31 DISALLOW_COPY_AND_ASSIGN(MultiProfileBrowserStatusMonitor); 37 DISALLOW_COPY_AND_ASSIGN(MultiProfileBrowserStatusMonitor);
32 }; 38 };
33 39
34 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H _ 40 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_BROWSER_STATUS_MONITOR_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698