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

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

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/tracking_area.h" 45 #import "chrome/browser/ui/cocoa/tracking_area.h"
46 #include "chrome/browser/ui/constrained_window_tab_helper.h" 46 #include "chrome/browser/ui/constrained_window_tab_helper.h"
47 #include "chrome/browser/ui/find_bar/find_bar.h" 47 #include "chrome/browser/ui/find_bar/find_bar.h"
48 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 48 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
49 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 49 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
50 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 50 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
51 #include "chrome/browser/ui/tabs/tab_menu_model.h" 51 #include "chrome/browser/ui/tabs/tab_menu_model.h"
52 #include "chrome/common/chrome_switches.h" 52 #include "chrome/common/chrome_switches.h"
53 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
54 #include "content/browser/tab_contents/navigation_controller.h"
55 #include "content/browser/tab_contents/tab_contents.h" 54 #include "content/browser/tab_contents/tab_contents.h"
56 #include "content/browser/tab_contents/tab_contents_view.h" 55 #include "content/browser/tab_contents/tab_contents_view.h"
56 #include "content/public/browser/navigation_controller.h"
57 #include "content/public/browser/user_metrics.h" 57 #include "content/public/browser/user_metrics.h"
58 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
59 #include "grit/theme_resources.h" 59 #include "grit/theme_resources.h"
60 #include "grit/theme_resources_standard.h" 60 #include "grit/theme_resources_standard.h"
61 #include "grit/ui_resources.h" 61 #include "grit/ui_resources.h"
62 #include "skia/ext/skia_utils_mac.h" 62 #include "skia/ext/skia_utils_mac.h"
63 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 63 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
64 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/resource/resource_bundle.h" 65 #include "ui/base/resource/resource_bundle.h"
66 #include "ui/gfx/image/image.h" 66 #include "ui/gfx/image/image.h"
(...skipping 2022 matching lines...) Expand 10 before | Expand all | Expand 10 after
2089 NSInteger index = [self indexFromModelIndex:modelIndex]; 2089 NSInteger index = [self indexFromModelIndex:modelIndex];
2090 BrowserWindowController* controller = 2090 BrowserWindowController* controller =
2091 (BrowserWindowController*)[[switchView_ window] windowController]; 2091 (BrowserWindowController*)[[switchView_ window] windowController];
2092 DCHECK(index >= 0); 2092 DCHECK(index >= 0);
2093 if (index >= 0) { 2093 if (index >= 0) {
2094 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; 2094 [controller setTab:[self viewAtIndex:index] isDraggable:YES];
2095 } 2095 }
2096 } 2096 }
2097 2097
2098 @end 2098 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698