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

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

Issue 1494293004: Componentize strings from generated_resources needed by LocalizedError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS Created 5 years 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/shelf/shelf_util.h" 7 #include "ash/shelf/shelf_util.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
11 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 11 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/browser_tabstrip.h" 14 #include "chrome/browser/ui/browser_tabstrip.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/settings_window_manager.h" 16 #include "chrome/browser/ui/settings_window_manager.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "components/strings/grit/components_strings.h"
18 #include "grit/ash_resources.h" 19 #include "grit/ash_resources.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
21 22
22 MultiProfileBrowserStatusMonitor::MultiProfileBrowserStatusMonitor( 23 MultiProfileBrowserStatusMonitor::MultiProfileBrowserStatusMonitor(
23 ChromeLauncherController* launcher_controller) 24 ChromeLauncherController* launcher_controller)
24 : BrowserStatusMonitor(launcher_controller), 25 : BrowserStatusMonitor(launcher_controller),
25 launcher_controller_(launcher_controller) { 26 launcher_controller_(launcher_controller) {
26 } 27 }
27 28
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 134
134 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher( 135 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
135 Browser* browser) { 136 Browser* browser) {
136 // Removing a V1 app from the launcher requires to remove the content and 137 // Removing a V1 app from the launcher requires to remove the content and
137 // the launcher item. 138 // the launcher item.
138 launcher_controller_->UpdateAppState( 139 launcher_controller_->UpdateAppState(
139 browser->tab_strip_model()->GetActiveWebContents(), 140 browser->tab_strip_model()->GetActiveWebContents(),
140 ChromeLauncherController::APP_STATE_REMOVED); 141 ChromeLauncherController::APP_STATE_REMOVED);
141 BrowserStatusMonitor::RemoveV1AppFromShelf(browser); 142 BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
142 } 143 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698