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

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

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 11 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
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/tab_contents_controller.h" 38 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
39 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" 39 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
40 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" 40 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
41 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" 41 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
42 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 42 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
43 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 43 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
44 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" 44 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
45 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h" 45 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h"
46 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" 46 #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h"
47 #import "chrome/browser/ui/cocoa/tracking_area.h" 47 #import "chrome/browser/ui/cocoa/tracking_area.h"
48 #include "chrome/browser/ui/constrained_window_tab_helper.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_strip_selection_model.h" 54 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
56 #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" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.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"
(...skipping 2035 matching lines...) Expand 10 before | Expand all | Expand 10 after
2102 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) { 2102 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) {
2103 // View hierarchy of the contents view: 2103 // View hierarchy of the contents view:
2104 // NSView -- switchView, same for all tabs 2104 // NSView -- switchView, same for all tabs
2105 // +- NSView -- TabContentsController's view 2105 // +- NSView -- TabContentsController's view
2106 // +- TabContentsViewCocoa 2106 // +- TabContentsViewCocoa
2107 // 2107 //
2108 // Changing it? Do not forget to modify 2108 // Changing it? Do not forget to modify
2109 // -[TabStripController swapInTabAtIndex:] too. 2109 // -[TabStripController swapInTabAtIndex:] too.
2110 return [web_contents->GetNativeView() superview]; 2110 return [web_contents->GetNativeView() superview];
2111 } 2111 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm ('k') | chrome/browser/ui/constrained_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698