Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

Issue 12763002: Move CrTrackingArea from chrome/browser/ui/cocoa to ui/base/cocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test in namespace Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 27 matching lines...) Expand all
38 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" 38 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
39 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 39 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
40 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" 40 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
41 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h" 41 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h"
42 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" 42 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
43 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" 43 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
44 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 44 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
45 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 45 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
46 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" 46 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
47 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" 47 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h"
48 #import "chrome/browser/ui/cocoa/tracking_area.h"
49 #include "chrome/browser/ui/find_bar/find_bar.h" 48 #include "chrome/browser/ui/find_bar/find_bar.h"
50 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 49 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
51 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 50 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
52 #include "chrome/browser/ui/tabs/tab_menu_model.h" 51 #include "chrome/browser/ui/tabs/tab_menu_model.h"
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" 52 #include "chrome/browser/ui/tabs/tab_strip_model.h"
54 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 53 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
55 #include "chrome/browser/ui/tabs/tab_utils.h" 54 #include "chrome/browser/ui/tabs/tab_utils.h"
56 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" 55 #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"
59 #include "content/public/browser/navigation_controller.h" 58 #include "content/public/browser/navigation_controller.h"
60 #include "content/public/browser/user_metrics.h" 59 #include "content/public/browser/user_metrics.h"
61 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
62 #include "content/public/browser/web_contents_view.h" 61 #include "content/public/browser/web_contents_view.h"
63 #include "grit/generated_resources.h" 62 #include "grit/generated_resources.h"
64 #include "grit/theme_resources.h" 63 #include "grit/theme_resources.h"
65 #include "grit/ui_resources.h" 64 #include "grit/ui_resources.h"
66 #include "skia/ext/skia_utils_mac.h" 65 #include "skia/ext/skia_utils_mac.h"
67 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 66 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
67 #import "ui/base/cocoa/tracking_area.h"
68 #include "ui/base/l10n/l10n_util.h" 68 #include "ui/base/l10n/l10n_util.h"
69 #include "ui/base/models/list_selection_model.h" 69 #include "ui/base/models/list_selection_model.h"
70 #include "ui/base/resource/resource_bundle.h" 70 #include "ui/base/resource/resource_bundle.h"
71 #include "ui/base/theme_provider.h" 71 #include "ui/base/theme_provider.h"
72 #include "ui/gfx/image/image.h" 72 #include "ui/gfx/image/image.h"
73 73
74 using content::OpenURLParams; 74 using content::OpenURLParams;
75 using content::Referrer; 75 using content::Referrer;
76 using content::UserMetricsAction; 76 using content::UserMetricsAction;
77 using content::WebContents; 77 using content::WebContents;
(...skipping 2155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2233 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { 2233 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) {
2234 // View hierarchy of the contents view: 2234 // View hierarchy of the contents view:
2235 // NSView -- switchView, same for all tabs 2235 // NSView -- switchView, same for all tabs
2236 // +- NSView -- TabContentsController's view 2236 // +- NSView -- TabContentsController's view
2237 // +- TabContentsViewCocoa 2237 // +- TabContentsViewCocoa
2238 // 2238 //
2239 // Changing it? Do not forget to modify 2239 // Changing it? Do not forget to modify
2240 // -[TabStripController swapInTabAtIndex:] too. 2240 // -[TabStripController swapInTabAtIndex:] too.
2241 return [web_contents->GetView()->GetNativeView() superview]; 2241 return [web_contents->GetView()->GetNativeView() superview];
2242 } 2242 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698