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

Side by Side Diff: chrome/browser/ui/ash/launcher/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/browser_status_monitor.h" 5 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
6 6
7 #include "ash/display/window_tree_host_manager.h" 7 #include "ash/display/window_tree_host_manager.h"
8 #include "ash/shelf/shelf_util.h" 8 #include "ash/shelf/shelf_util.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 12 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_finder.h" 15 #include "chrome/browser/ui/browser_finder.h"
16 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.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/settings_window_manager_observer.h" 19 #include "chrome/browser/ui/settings_window_manager_observer.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/browser/web_applications/web_app.h" 21 #include "chrome/browser/web_applications/web_app.h"
22 #include "components/strings/grit/components_strings.h"
22 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
23 #include "content/public/browser/web_contents_observer.h" 24 #include "content/public/browser/web_contents_observer.h"
24 #include "grit/ash_resources.h" 25 #include "grit/ash_resources.h"
25 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
26 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
27 #include "ui/aura/window_event_dispatcher.h" 28 #include "ui/aura/window_event_dispatcher.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/gfx/screen.h" 30 #include "ui/gfx/screen.h"
30 #include "ui/wm/public/activation_client.h" 31 #include "ui/wm/public/activation_client.h"
31 32
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 content::WebContents* contents) { 383 content::WebContents* contents) {
383 return launcher_controller_->GetShelfIDForWebContents(contents); 384 return launcher_controller_->GetShelfIDForWebContents(contents);
384 } 385 }
385 386
386 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents( 387 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
387 Browser* browser, 388 Browser* browser,
388 content::WebContents* web_contents) { 389 content::WebContents* web_contents) {
389 launcher_controller_->GetBrowserShortcutLauncherItemController()-> 390 launcher_controller_->GetBrowserShortcutLauncherItemController()->
390 SetShelfIDForBrowserWindowContents(browser, web_contents); 391 SetShelfIDForBrowserWindowContents(browser, web_contents);
391 } 392 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698