Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/api/tab_capture/tab_capture_registry.h" | 5 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 browsers ? browsers->GetLastActive() : nullptr; | 97 browsers ? browsers->GetLastActive() : nullptr; |
| 98 BrowserWindow* const active_window = | 98 BrowserWindow* const active_window = |
| 99 active_browser ? active_browser->window() : nullptr; | 99 active_browser ? active_browser->window() : nullptr; |
| 100 aura::Window* const native_window = | 100 aura::Window* const native_window = |
| 101 active_window ? active_window->GetNativeWindow() : nullptr; | 101 active_window ? active_window->GetNativeWindow() : nullptr; |
| 102 aura::Window* const root_window = | 102 aura::Window* const root_window = |
| 103 native_window ? native_window->GetRootWindow() : nullptr; | 103 native_window ? native_window->GetRootWindow() : nullptr; |
| 104 if (root_window) { | 104 if (root_window) { |
| 105 DVLOG(2) << "Root window " << root_window | 105 DVLOG(2) << "Root window " << root_window |
| 106 << " adopts the content window " << content_window_ << '.'; | 106 << " adopts the content window " << content_window_ << '.'; |
| 107 root_window->AddChild(content_window_); | 107 root_window->AddChild(content_window_); |
|
miu
2017/02/24 22:51:55
Some work has been done in content::DelegatedFrame
zhaobin
2017/02/25 00:30:44
browser_tests passed if comment out this LOC. But
| |
| 108 } else { | 108 } else { |
| 109 LOG(DFATAL) << "Unable to find an aura root window. " | 109 LOG(WARNING) << "Unable to find an aura root window. " |
| 110 "Compositing of the content may be halted!"; | 110 "Compositing of the content may be halted!"; |
| 111 } | 111 } |
| 112 } | 112 } |
| 113 | 113 |
| 114 aura::Window* content_window_; | 114 aura::Window* content_window_; |
| 115 base::WeakPtrFactory<WindowAdoptionAgent> weak_ptr_factory_; | 115 base::WeakPtrFactory<WindowAdoptionAgent> weak_ptr_factory_; |
| 116 | 116 |
| 117 DISALLOW_COPY_AND_ASSIGN(WindowAdoptionAgent); | 117 DISALLOW_COPY_AND_ASSIGN(WindowAdoptionAgent); |
| 118 }; | 118 }; |
| 119 #endif // USE_AURA | 119 #endif // USE_AURA |
| 120 | 120 |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 464 it != requests_.end(); ++it) { | 464 it != requests_.end(); ++it) { |
| 465 if (it->get() == request) { | 465 if (it->get() == request) { |
| 466 requests_.erase(it); | 466 requests_.erase(it); |
| 467 return; | 467 return; |
| 468 } | 468 } |
| 469 } | 469 } |
| 470 NOTREACHED(); | 470 NOTREACHED(); |
| 471 } | 471 } |
| 472 | 472 |
| 473 } // namespace extensions | 473 } // namespace extensions |
| OLD | NEW |