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 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 5 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
6 | 6 |
7 #import <QuartzCore/QuartzCore.h> | 7 #import <QuartzCore/QuartzCore.h> |
8 | 8 |
9 #include <cmath> | 9 #include <cmath> |
10 #include <limits> | 10 #include <limits> |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 46 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" |
47 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" | 47 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" |
48 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" | 48 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" |
49 #include "chrome/browser/ui/find_bar/find_bar.h" | 49 #include "chrome/browser/ui/find_bar/find_bar.h" |
50 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 50 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
51 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 51 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
52 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 52 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 53 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
54 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 54 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
55 #include "chrome/browser/ui/tabs/tab_utils.h" | 55 #include "chrome/browser/ui/tabs/tab_utils.h" |
56 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | |
57 #include "chrome/common/chrome_switches.h" | 56 #include "chrome/common/chrome_switches.h" |
58 #include "chrome/common/pref_names.h" | 57 #include "chrome/common/pref_names.h" |
| 58 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
59 #include "content/public/browser/navigation_controller.h" | 59 #include "content/public/browser/navigation_controller.h" |
60 #include "content/public/browser/user_metrics.h" | 60 #include "content/public/browser/user_metrics.h" |
61 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
62 #include "content/public/browser/web_contents_view.h" | 62 #include "content/public/browser/web_contents_view.h" |
63 #include "grit/generated_resources.h" | 63 #include "grit/generated_resources.h" |
64 #include "grit/theme_resources.h" | 64 #include "grit/theme_resources.h" |
65 #include "grit/ui_resources.h" | 65 #include "grit/ui_resources.h" |
66 #include "skia/ext/skia_utils_mac.h" | 66 #include "skia/ext/skia_utils_mac.h" |
67 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | 67 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" |
68 #import "ui/base/animation/animation_container.h" | 68 #import "ui/base/animation/animation_container.h" |
(...skipping 2226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2295 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { | 2295 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { |
2296 // View hierarchy of the contents view: | 2296 // View hierarchy of the contents view: |
2297 // NSView -- switchView, same for all tabs | 2297 // NSView -- switchView, same for all tabs |
2298 // +- NSView -- TabContentsController's view | 2298 // +- NSView -- TabContentsController's view |
2299 // +- TabContentsViewCocoa | 2299 // +- TabContentsViewCocoa |
2300 // | 2300 // |
2301 // Changing it? Do not forget to modify | 2301 // Changing it? Do not forget to modify |
2302 // -[TabStripController swapInTabAtIndex:] too. | 2302 // -[TabStripController swapInTabAtIndex:] too. |
2303 return [web_contents->GetView()->GetNativeView() superview]; | 2303 return [web_contents->GetView()->GetNativeView() superview]; |
2304 } | 2304 } |
OLD | NEW |