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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/task_manager_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
11 #include <string> 11 #include <string>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
15 #include "base/mac/scoped_nsautorelease_pool.h" 15 #include "base/mac/scoped_nsautorelease_pool.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/prefs/pref_service.h"
17 #include "base/sys_string_conversions.h" 18 #include "base/sys_string_conversions.h"
18 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
20 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
21 #include "chrome/browser/autocomplete/autocomplete_match.h" 22 #include "chrome/browser/autocomplete/autocomplete_match.h"
22 #include "chrome/browser/devtools/devtools_window.h" 23 #include "chrome/browser/devtools/devtools_window.h"
23 #include "chrome/browser/extensions/tab_helper.h" 24 #include "chrome/browser/extensions/tab_helper.h"
24 #include "chrome/browser/favicon/favicon_tab_helper.h" 25 #include "chrome/browser/favicon/favicon_tab_helper.h"
25 #include "chrome/browser/net/url_fixer_upper.h" 26 #include "chrome/browser/net/url_fixer_upper.h"
26 #include "chrome/browser/prefs/pref_service.h"
27 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/profiles/profile_manager.h" 28 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/themes/theme_service.h" 29 #include "chrome/browser/themes/theme_service.h"
30 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
31 #include "chrome/browser/ui/browser_navigator.h" 31 #include "chrome/browser/ui/browser_navigator.h"
32 #include "chrome/browser/ui/browser_tabstrip.h" 32 #include "chrome/browser/ui/browser_tabstrip.h"
33 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 33 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
34 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h" 34 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
35 #include "chrome/browser/ui/cocoa/drag_util.h" 35 #include "chrome/browser/ui/cocoa/drag_util.h"
36 #import "chrome/browser/ui/cocoa/image_button_cell.h" 36 #import "chrome/browser/ui/cocoa/image_button_cell.h"
37 #import "chrome/browser/ui/cocoa/new_tab_button.h" 37 #import "chrome/browser/ui/cocoa/new_tab_button.h"
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_strip_drag_controller.h" 42 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
42 #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"
43 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 44 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
44 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 45 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
45 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" 46 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
46 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_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" 48 #import "chrome/browser/ui/cocoa/tracking_area.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" 56 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
(...skipping 2175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { 2232 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) {
2233 // View hierarchy of the contents view: 2233 // View hierarchy of the contents view:
2234 // NSView -- switchView, same for all tabs 2234 // NSView -- switchView, same for all tabs
2235 // +- NSView -- TabContentsController's view 2235 // +- NSView -- TabContentsController's view
2236 // +- TabContentsViewCocoa 2236 // +- TabContentsViewCocoa
2237 // 2237 //
2238 // Changing it? Do not forget to modify 2238 // Changing it? Do not forget to modify
2239 // -[TabStripController swapInTabAtIndex:] too. 2239 // -[TabStripController swapInTabAtIndex:] too.
2240 return [web_contents->GetNativeView() superview]; 2240 return [web_contents->GetNativeView() superview];
2241 } 2241 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/task_manager_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698