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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 43 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" |
44 #include "chrome/browser/ui/find_bar/find_bar.h" | 44 #include "chrome/browser/ui/find_bar/find_bar.h" |
45 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 45 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
46 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 46 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
47 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 47 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 48 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
49 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 49 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
50 #include "chrome/browser/ui/tabs/tab_utils.h" | 50 #include "chrome/browser/ui/tabs/tab_utils.h" |
51 #include "chrome/common/chrome_switches.h" | 51 #include "chrome/common/chrome_switches.h" |
52 #include "chrome/common/pref_names.h" | 52 #include "chrome/common/pref_names.h" |
53 #include "components/autocomplete/autocomplete_match.h" | |
54 #include "components/metrics/proto/omnibox_event.pb.h" | 53 #include "components/metrics/proto/omnibox_event.pb.h" |
| 54 #include "components/omnibox/autocomplete_match.h" |
55 #include "components/url_fixer/url_fixer.h" | 55 #include "components/url_fixer/url_fixer.h" |
56 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 56 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
57 #include "content/public/browser/navigation_controller.h" | 57 #include "content/public/browser/navigation_controller.h" |
58 #include "content/public/browser/user_metrics.h" | 58 #include "content/public/browser/user_metrics.h" |
59 #include "content/public/browser/web_contents.h" | 59 #include "content/public/browser/web_contents.h" |
60 #include "grit/generated_resources.h" | 60 #include "grit/generated_resources.h" |
61 #include "grit/theme_resources.h" | 61 #include "grit/theme_resources.h" |
62 #include "grit/ui_resources.h" | 62 #include "grit/ui_resources.h" |
63 #include "skia/ext/skia_utils_mac.h" | 63 #include "skia/ext/skia_utils_mac.h" |
64 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" | 64 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" |
(...skipping 2156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2221 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { | 2221 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { |
2222 // View hierarchy of the contents view: | 2222 // View hierarchy of the contents view: |
2223 // NSView -- switchView, same for all tabs | 2223 // NSView -- switchView, same for all tabs |
2224 // +- NSView -- TabContentsController's view | 2224 // +- NSView -- TabContentsController's view |
2225 // +- TabContentsViewCocoa | 2225 // +- TabContentsViewCocoa |
2226 // | 2226 // |
2227 // Changing it? Do not forget to modify | 2227 // Changing it? Do not forget to modify |
2228 // -[TabStripController swapInTabAtIndex:] too. | 2228 // -[TabStripController swapInTabAtIndex:] too. |
2229 return [web_contents->GetNativeView() superview]; | 2229 return [web_contents->GetNativeView() superview]; |
2230 } | 2230 } |
OLD | NEW |