Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 457 toolbar_(nullptr), | 457 toolbar_(nullptr), |
| 458 find_bar_host_view_(nullptr), | 458 find_bar_host_view_(nullptr), |
| 459 infobar_container_(nullptr), | 459 infobar_container_(nullptr), |
| 460 contents_web_view_(nullptr), | 460 contents_web_view_(nullptr), |
| 461 devtools_web_view_(nullptr), | 461 devtools_web_view_(nullptr), |
| 462 contents_container_(nullptr), | 462 contents_container_(nullptr), |
| 463 initialized_(false), | 463 initialized_(false), |
| 464 handling_theme_changed_(false), | 464 handling_theme_changed_(false), |
| 465 in_process_fullscreen_(false), | 465 in_process_fullscreen_(false), |
| 466 #if defined(OS_WIN) | 466 #if defined(OS_WIN) |
| 467 // TODO(piman): is this still useful now that windowed plugins are gone? | |
|
jam
2016/03/18 17:00:19
ah, saw this now. yes i dont see a reason to have
| |
| 467 ticker_(0), | 468 ticker_(0), |
| 468 hung_window_detector_(&hung_plugin_action_), | 469 hung_window_detector_(&hung_plugin_action_), |
| 469 #endif | 470 #endif |
| 470 force_location_bar_focus_(false), | 471 force_location_bar_focus_(false), |
| 471 activate_modal_dialog_factory_(this) { | 472 activate_modal_dialog_factory_(this) { |
| 472 } | 473 } |
| 473 | 474 |
| 474 BrowserView::~BrowserView() { | 475 BrowserView::~BrowserView() { |
| 475 // All the tabs should have been destroyed already. If we were closed by the | 476 // All the tabs should have been destroyed already. If we were closed by the |
| 476 // OS with some tabs than the NativeBrowserFrame should have destroyed them. | 477 // OS with some tabs than the NativeBrowserFrame should have destroyed them. |
| (...skipping 2234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2711 } | 2712 } |
| 2712 | 2713 |
| 2713 extensions::ActiveTabPermissionGranter* | 2714 extensions::ActiveTabPermissionGranter* |
| 2714 BrowserView::GetActiveTabPermissionGranter() { | 2715 BrowserView::GetActiveTabPermissionGranter() { |
| 2715 content::WebContents* web_contents = GetActiveWebContents(); | 2716 content::WebContents* web_contents = GetActiveWebContents(); |
| 2716 if (!web_contents) | 2717 if (!web_contents) |
| 2717 return nullptr; | 2718 return nullptr; |
| 2718 return extensions::TabHelper::FromWebContents(web_contents) | 2719 return extensions::TabHelper::FromWebContents(web_contents) |
| 2719 ->active_tab_permission_granter(); | 2720 ->active_tab_permission_granter(); |
| 2720 } | 2721 } |
| OLD | NEW |