| 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 30 matching lines...) Expand all Loading... |
| 41 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 41 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
| 42 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 42 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" |
| 43 #include "chrome/browser/ui/find_bar/find_bar.h" | 43 #include "chrome/browser/ui/find_bar/find_bar.h" |
| 44 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 44 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| 45 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 45 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
| 46 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 46 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
| 47 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 47 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 48 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 48 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
| 49 #include "chrome/browser/ui/tabs/tab_utils.h" | 49 #include "chrome/browser/ui/tabs/tab_utils.h" |
| 50 #include "chrome/common/chrome_switches.h" | 50 #include "chrome/common/chrome_switches.h" |
| 51 #include "chrome/common/pref_names.h" | |
| 52 #include "chrome/grit/generated_resources.h" | 51 #include "chrome/grit/generated_resources.h" |
| 53 #include "components/metrics/proto/omnibox_event.pb.h" | 52 #include "components/metrics/proto/omnibox_event.pb.h" |
| 54 #include "components/omnibox/autocomplete_match.h" | 53 #include "components/omnibox/autocomplete_match.h" |
| 55 #include "components/url_fixer/url_fixer.h" | 54 #include "components/url_fixer/url_fixer.h" |
| 56 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 55 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 57 #include "content/public/browser/navigation_controller.h" | 56 #include "content/public/browser/navigation_controller.h" |
| 58 #include "content/public/browser/user_metrics.h" | 57 #include "content/public/browser/user_metrics.h" |
| 59 #include "content/public/browser/web_contents.h" | 58 #include "content/public/browser/web_contents.h" |
| 60 #include "grit/theme_resources.h" | 59 #include "grit/theme_resources.h" |
| 61 #include "skia/ext/skia_utils_mac.h" | 60 #include "skia/ext/skia_utils_mac.h" |
| (...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2313 // up the hierarchy to the devtools container view to avoid that. Note that | 2312 // up the hierarchy to the devtools container view to avoid that. Note that |
| 2314 // the devtools view is always in the hierarchy even if it is not open or it | 2313 // the devtools view is always in the hierarchy even if it is not open or it |
| 2315 // is detached. | 2314 // is detached. |
| 2316 NSView* devtools_view = [[[view superview] superview] superview]; | 2315 NSView* devtools_view = [[[view superview] superview] superview]; |
| 2317 if (devtools_view) { | 2316 if (devtools_view) { |
| 2318 return [devtools_view convertRect:[devtools_view bounds] toView:nil]; | 2317 return [devtools_view convertRect:[devtools_view bounds] toView:nil]; |
| 2319 } else { | 2318 } else { |
| 2320 return [view convertRect:[view bounds] toView:nil]; | 2319 return [view convertRect:[view bounds] toView:nil]; |
| 2321 } | 2320 } |
| 2322 } | 2321 } |
| OLD | NEW |