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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | 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 #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/shelf/shelf_util.h" 7 #include "ash/shelf/shelf_util.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 11 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.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/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_finder.h" 14 #include "chrome/browser/ui/browser_finder.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/web_applications/web_app.h" 18 #include "chrome/browser/web_applications/web_app.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "ui/aura/client/activation_client.h" 20 #include "ui/aura/client/activation_client.h"
21 #include "ui/aura/root_window.h"
22 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
22 #include "ui/aura/window_event_dispatcher.h"
23 #include "ui/gfx/screen.h" 23 #include "ui/gfx/screen.h"
24 24
25 BrowserStatusMonitor::LocalWebContentsObserver::LocalWebContentsObserver( 25 BrowserStatusMonitor::LocalWebContentsObserver::LocalWebContentsObserver(
26 content::WebContents* contents, 26 content::WebContents* contents,
27 BrowserStatusMonitor* monitor) 27 BrowserStatusMonitor* monitor)
28 : content::WebContentsObserver(contents), 28 : content::WebContentsObserver(contents),
29 monitor_(monitor) { 29 monitor_(monitor) {
30 } 30 }
31 31
32 BrowserStatusMonitor::LocalWebContentsObserver::~LocalWebContentsObserver() { 32 BrowserStatusMonitor::LocalWebContentsObserver::~LocalWebContentsObserver() {
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 DCHECK(webcontents_to_observer_map_.find(contents) != 330 DCHECK(webcontents_to_observer_map_.find(contents) !=
331 webcontents_to_observer_map_.end()); 331 webcontents_to_observer_map_.end());
332 delete webcontents_to_observer_map_[contents]; 332 delete webcontents_to_observer_map_[contents];
333 webcontents_to_observer_map_.erase(contents); 333 webcontents_to_observer_map_.erase(contents);
334 } 334 }
335 335
336 ash::ShelfID BrowserStatusMonitor::GetShelfIDForWebContents( 336 ash::ShelfID BrowserStatusMonitor::GetShelfIDForWebContents(
337 content::WebContents* contents) { 337 content::WebContents* contents) {
338 return launcher_controller_->GetShelfIDForWebContents(contents); 338 return launcher_controller_->GetShelfIDForWebContents(contents);
339 } 339 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698