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

Unified Diff: trunk/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

Issue 23538010: Revert 222124 "Makes BrowserStatusMonitor remove observers in de..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/ash/launcher/browser_status_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc (revision 222137)
+++ trunk/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc (working copy)
@@ -272,7 +272,7 @@
items.push_back(*it);
}
// If there are no suitable browsers we create a new one.
- if (items.empty()) {
+ if (!items.size()) {
launcher_controller()->CreateNewWindow();
return;
}
@@ -288,8 +288,8 @@
browser = items[0];
} else {
// If there is more then one suitable browser, we advance to the next if
- // |browser| is already active - or - check the last used browser if it can
- // be used.
+ // |current_browser| is already active - or - check the last used browser
+ // if it can be used.
std::vector<Browser*>::iterator i =
std::find(items.begin(), items.end(), browser);
if (i != items.end()) {
@@ -311,7 +311,6 @@
bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
Browser* browser) {
return (browser &&
- browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
(browser->is_type_tabbed() ||
!browser->is_app() ||
!browser->is_type_popup() ||
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/ash/launcher/browser_status_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698