Permalink
Browse files

refactoring: views and controllers

  • Loading branch information...
1 parent 2407899 commit 4da4ba1bf1773cd927aa6422c43eac3b03671a1b @rsms committed Aug 26, 2010
Showing with 91 additions and 119 deletions.
  1. +1 −1 LICENSE
  2. 0 src/base/LICENSE → LICENSE-chromium
  3. +30 −30 chromium-tabs.xcodeproj/project.pbxproj
  4. +1 −1 src/CTBrowser.mm
  5. +1 −1 src/CTBrowserWindowController.h
  6. +3 −3 src/CTBrowserWindowController.mm
  7. +1 −1 src/base/basictypes.h
  8. +1 −1 src/base/cocoa_protocols_mac.h
  9. +1 −1 src/base/observer_list.h
  10. +1 −1 src/base/scoped_cftyperef.h
  11. +1 −1 src/base/scoped_nsdisable_screen_updates.h
  12. +1 −1 src/base/scoped_nsobject.h
  13. +1 −1 src/base/scoped_ptr.h
  14. +1 −1 src/base/stl_util-inl.h
  15. +0 −27 src/chrome/LICENSE
  16. +1 −1 src/chrome/browser/cocoa/{tab_contents_controller.h → CTTabContentsController.h}
  17. +2 −2 src/chrome/browser/cocoa/{tab_contents_controller.mm → CTTabContentsController.mm}
  18. +1 −1 src/chrome/browser/cocoa/CTTabController.h
  19. +1 −1 src/chrome/browser/cocoa/CTTabController.mm
  20. +1 −1 src/chrome/browser/cocoa/CTTabControllerTarget.h
  21. +1 −1 src/chrome/browser/cocoa/{tab_strip_controller.h → CTTabStripController.h}
  22. +5 −5 src/chrome/browser/cocoa/{tab_strip_controller.mm → CTTabStripController.mm}
  23. +1 −1 src/chrome/browser/cocoa/{tab_strip_model_observer_bridge.h → CTTabStripModelObserverBridge.h}
  24. +2 −2 src/chrome/browser/cocoa/{tab_strip_model_observer_bridge.mm → CTTabStripModelObserverBridge.mm}
  25. +1 −1 src/chrome/browser/cocoa/{tab_strip_view.h → CTTabStripView.h}
  26. +3 −3 src/chrome/browser/cocoa/{tab_strip_view.mm → CTTabStripView.mm}
  27. +1 −1 src/chrome/browser/cocoa/CTTabView.h
  28. +2 −2 src/chrome/browser/cocoa/CTTabView.mm
  29. +1 −1 src/chrome/browser/cocoa/{tab_window_controller.h → CTTabWindowController.h}
  30. +3 −3 src/chrome/browser/cocoa/{tab_window_controller.mm → CTTabWindowController.mm}
  31. +1 −1 src/chrome/browser/cocoa/background_gradient_view.h
  32. +1 −1 src/chrome/browser/cocoa/background_gradient_view.mm
  33. +1 −1 src/chrome/browser/cocoa/fast_resize_view.h
  34. +1 −1 src/chrome/browser/cocoa/fast_resize_view.mm
  35. +1 −1 src/chrome/browser/cocoa/hover_button.h
  36. +1 −1 src/chrome/browser/cocoa/hover_button.mm
  37. +1 −1 src/chrome/browser/cocoa/hover_close_button.h
  38. +1 −1 src/chrome/browser/cocoa/hover_close_button.mm
  39. +1 −1 src/chrome/browser/cocoa/new_tab_button.h
  40. +1 −1 src/chrome/browser/cocoa/new_tab_button.mm
  41. +1 −3 src/chrome/browser/cocoa/throbber_view.h
  42. +2 −1 src/chrome/browser/cocoa/throbber_view.mm
  43. +1 −1 src/chrome/browser/cocoa/url_drop_target.h
  44. +1 −1 src/chrome/browser/cocoa/url_drop_target.mm
  45. +1 −1 src/chrome/browser/tabs/CTTabStripModel.h
  46. +1 −1 src/chrome/browser/tabs/CTTabStripModel.mm
  47. +1 −1 src/chrome/browser/tabs/CTTabStripModelOrderController.h
  48. +1 −1 src/chrome/browser/tabs/CTTabStripModelOrderController.mm
  49. +1 −1 src/chrome/common/CTPageTransition.c
  50. +1 −1 src/chrome/common/CTPageTransition.h
View
@@ -3,7 +3,7 @@ created by (origins from) a third party. The third party material used by
Chromium Tabs are:
- Chromium, located under src/chrome and src/base, copyright Google, Inc. BSD
- license.
+ license. See LICENSE-chromium.
- Google Toolbox for Mac, located under src/third_party/gtm-subset, copyright
by Google, Inc. Apache 2.0 license.
File renamed without changes.
@@ -19,17 +19,17 @@
3A3ED9C81225E32A009E2908 /* background_gradient_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A3927121221C596006D8305 /* background_gradient_view.mm */; };
3A3ED9C91225E32A009E2908 /* CTTabController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A3921F21221AF58006D8305 /* CTTabController.mm */; };
3A3ED9CA1225E32A009E2908 /* CTTabView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A39270B1221C566006D8305 /* CTTabView.mm */; };
- 3A3ED9CB1225E32A009E2908 /* tab_window_controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286F8E1222CAA000F1BB78 /* tab_window_controller.mm */; };
- 3A3ED9CC1225E32A009E2908 /* tab_strip_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286F8C1222CAA000F1BB78 /* tab_strip_view.mm */; };
+ 3A3ED9CB1225E32A009E2908 /* CTTabWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286F8E1222CAA000F1BB78 /* CTTabWindowController.mm */; };
+ 3A3ED9CC1225E32A009E2908 /* CTTabStripView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286F8C1222CAA000F1BB78 /* CTTabStripView.mm */; };
3A3ED9CE1225E32A009E2908 /* url_drop_target.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286FC11222D10700F1BB78 /* url_drop_target.mm */; };
3A3ED9CF1225E32A009E2908 /* throbber_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286FE81222D53500F1BB78 /* throbber_view.mm */; };
3A3ED9D01225E32A009E2908 /* CTTabContents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3AEE19531222DDEB009DA438 /* CTTabContents.mm */; };
3A3ED9D11225E32A009E2908 /* CTTabStripModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3AEE19411222DC5B009DA438 /* CTTabStripModel.mm */; };
3A3ED9D21225E32A009E2908 /* CTTabStripModelOrderController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3AEE19431222DC5B009DA438 /* CTTabStripModelOrderController.mm */; };
- 3A3ED9D31225E32A009E2908 /* tab_contents_controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A236D9F1223375D00D21E66 /* tab_contents_controller.mm */; };
- 3A3ED9D41225E32A009E2908 /* tab_strip_controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286FE31222D25400F1BB78 /* tab_strip_controller.mm */; };
+ 3A3ED9D31225E32A009E2908 /* CTTabContentsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A236D9F1223375D00D21E66 /* CTTabContentsController.mm */; };
+ 3A3ED9D41225E32A009E2908 /* CTTabStripController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A286FE31222D25400F1BB78 /* CTTabStripController.mm */; };
3A3ED9D51225E32A009E2908 /* new_tab_button.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A236DD81223414F00D21E66 /* new_tab_button.mm */; };
- 3A3ED9D61225E32A009E2908 /* tab_strip_model_observer_bridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A236DAE12233B3400D21E66 /* tab_strip_model_observer_bridge.mm */; };
+ 3A3ED9D61225E32A009E2908 /* CTTabStripModelObserverBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A236DAE12233B3400D21E66 /* CTTabStripModelObserverBridge.mm */; };
3A3ED9D71225E32A009E2908 /* CTBrowserWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A1CF96012235704008A3B8C /* CTBrowserWindowController.mm */; };
3A3ED9D81225E32A009E2908 /* fast_resize_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A1CF98812235CEE008A3B8C /* fast_resize_view.mm */; };
3A3ED9D91225E32A009E2908 /* CTBrowser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3AA7188A122479CE005022BE /* CTBrowser.mm */; };
@@ -110,25 +110,25 @@
3A1CF96012235704008A3B8C /* CTBrowserWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTBrowserWindowController.mm; sourceTree = "<group>"; };
3A1CF98712235CEE008A3B8C /* fast_resize_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fast_resize_view.h; sourceTree = "<group>"; };
3A1CF98812235CEE008A3B8C /* fast_resize_view.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = fast_resize_view.mm; sourceTree = "<group>"; };
- 3A236D9E1223375D00D21E66 /* tab_contents_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab_contents_controller.h; sourceTree = "<group>"; };
- 3A236D9F1223375D00D21E66 /* tab_contents_controller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tab_contents_controller.mm; sourceTree = "<group>"; };
- 3A236DAD12233B3400D21E66 /* tab_strip_model_observer_bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab_strip_model_observer_bridge.h; sourceTree = "<group>"; };
- 3A236DAE12233B3400D21E66 /* tab_strip_model_observer_bridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tab_strip_model_observer_bridge.mm; sourceTree = "<group>"; };
+ 3A236D9E1223375D00D21E66 /* CTTabContentsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabContentsController.h; sourceTree = "<group>"; };
+ 3A236D9F1223375D00D21E66 /* CTTabContentsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTTabContentsController.mm; sourceTree = "<group>"; };
+ 3A236DAD12233B3400D21E66 /* CTTabStripModelObserverBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabStripModelObserverBridge.h; sourceTree = "<group>"; };
+ 3A236DAE12233B3400D21E66 /* CTTabStripModelObserverBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTTabStripModelObserverBridge.mm; sourceTree = "<group>"; };
3A236DD71223414F00D21E66 /* new_tab_button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = new_tab_button.h; sourceTree = "<group>"; };
3A236DD81223414F00D21E66 /* new_tab_button.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = new_tab_button.mm; sourceTree = "<group>"; };
3A286E8C1222C63D00F1BB78 /* CTTabControllerTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabControllerTarget.h; sourceTree = "<group>"; };
3A286EA51222C8EA00F1BB78 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
- 3A286F8B1222CAA000F1BB78 /* tab_strip_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab_strip_view.h; sourceTree = "<group>"; };
- 3A286F8C1222CAA000F1BB78 /* tab_strip_view.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tab_strip_view.mm; sourceTree = "<group>"; };
- 3A286F8D1222CAA000F1BB78 /* tab_window_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab_window_controller.h; sourceTree = "<group>"; };
- 3A286F8E1222CAA000F1BB78 /* tab_window_controller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tab_window_controller.mm; sourceTree = "<group>"; };
+ 3A286F8B1222CAA000F1BB78 /* CTTabStripView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabStripView.h; sourceTree = "<group>"; };
+ 3A286F8C1222CAA000F1BB78 /* CTTabStripView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTTabStripView.mm; sourceTree = "<group>"; };
+ 3A286F8D1222CAA000F1BB78 /* CTTabWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabWindowController.h; sourceTree = "<group>"; };
+ 3A286F8E1222CAA000F1BB78 /* CTTabWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTTabWindowController.mm; sourceTree = "<group>"; };
3A286F9E1222CDBE00F1BB78 /* BrowserWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BrowserWindow.xib; sourceTree = "<group>"; };
3A286F9F1222CDBE00F1BB78 /* TabContents.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TabContents.xib; sourceTree = "<group>"; };
3A286FA01222CDBE00F1BB78 /* TabView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TabView.xib; sourceTree = "<group>"; };
3A286FC01222D10700F1BB78 /* url_drop_target.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_drop_target.h; sourceTree = "<group>"; };
3A286FC11222D10700F1BB78 /* url_drop_target.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = url_drop_target.mm; sourceTree = "<group>"; };
- 3A286FE21222D25400F1BB78 /* tab_strip_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab_strip_controller.h; sourceTree = "<group>"; };
- 3A286FE31222D25400F1BB78 /* tab_strip_controller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tab_strip_controller.mm; sourceTree = "<group>"; };
+ 3A286FE21222D25400F1BB78 /* CTTabStripController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTTabStripController.h; sourceTree = "<group>"; };
+ 3A286FE31222D25400F1BB78 /* CTTabStripController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CTTabStripController.mm; sourceTree = "<group>"; };
3A286FE71222D53500F1BB78 /* throbber_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = throbber_view.h; sourceTree = "<group>"; };
3A286FE81222D53500F1BB78 /* throbber_view.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = throbber_view.mm; sourceTree = "<group>"; };
3A286FEA1222D61900F1BB78 /* newtab_h.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = newtab_h.pdf; path = gfx/newtab_h.pdf; sourceTree = "<group>"; };
@@ -367,16 +367,16 @@
3A3921F11221AF58006D8305 /* CTTabController.h */,
3A286E8C1222C63D00F1BB78 /* CTTabControllerTarget.h */,
3A3921F21221AF58006D8305 /* CTTabController.mm */,
- 3A236D9E1223375D00D21E66 /* tab_contents_controller.h */,
- 3A236D9F1223375D00D21E66 /* tab_contents_controller.mm */,
- 3A286F8B1222CAA000F1BB78 /* tab_strip_view.h */,
- 3A286F8C1222CAA000F1BB78 /* tab_strip_view.mm */,
- 3A286FE21222D25400F1BB78 /* tab_strip_controller.h */,
- 3A286FE31222D25400F1BB78 /* tab_strip_controller.mm */,
- 3A286F8D1222CAA000F1BB78 /* tab_window_controller.h */,
- 3A286F8E1222CAA000F1BB78 /* tab_window_controller.mm */,
- 3A236DAD12233B3400D21E66 /* tab_strip_model_observer_bridge.h */,
- 3A236DAE12233B3400D21E66 /* tab_strip_model_observer_bridge.mm */,
+ 3A236D9E1223375D00D21E66 /* CTTabContentsController.h */,
+ 3A236D9F1223375D00D21E66 /* CTTabContentsController.mm */,
+ 3A286F8B1222CAA000F1BB78 /* CTTabStripView.h */,
+ 3A286F8C1222CAA000F1BB78 /* CTTabStripView.mm */,
+ 3A286FE21222D25400F1BB78 /* CTTabStripController.h */,
+ 3A286FE31222D25400F1BB78 /* CTTabStripController.mm */,
+ 3A286F8D1222CAA000F1BB78 /* CTTabWindowController.h */,
+ 3A286F8E1222CAA000F1BB78 /* CTTabWindowController.mm */,
+ 3A236DAD12233B3400D21E66 /* CTTabStripModelObserverBridge.h */,
+ 3A236DAE12233B3400D21E66 /* CTTabStripModelObserverBridge.mm */,
3A1CF98712235CEE008A3B8C /* fast_resize_view.h */,
3A1CF98812235CEE008A3B8C /* fast_resize_view.mm */,
);
@@ -607,17 +607,17 @@
3A3ED9C81225E32A009E2908 /* background_gradient_view.mm in Sources */,
3A3ED9C91225E32A009E2908 /* CTTabController.mm in Sources */,
3A3ED9CA1225E32A009E2908 /* CTTabView.mm in Sources */,
- 3A3ED9CB1225E32A009E2908 /* tab_window_controller.mm in Sources */,
- 3A3ED9CC1225E32A009E2908 /* tab_strip_view.mm in Sources */,
+ 3A3ED9CB1225E32A009E2908 /* CTTabWindowController.mm in Sources */,
+ 3A3ED9CC1225E32A009E2908 /* CTTabStripView.mm in Sources */,
3A3ED9CE1225E32A009E2908 /* url_drop_target.mm in Sources */,
3A3ED9CF1225E32A009E2908 /* throbber_view.mm in Sources */,
3A3ED9D01225E32A009E2908 /* CTTabContents.mm in Sources */,
3A3ED9D11225E32A009E2908 /* CTTabStripModel.mm in Sources */,
3A3ED9D21225E32A009E2908 /* CTTabStripModelOrderController.mm in Sources */,
- 3A3ED9D31225E32A009E2908 /* tab_contents_controller.mm in Sources */,
- 3A3ED9D41225E32A009E2908 /* tab_strip_controller.mm in Sources */,
+ 3A3ED9D31225E32A009E2908 /* CTTabContentsController.mm in Sources */,
+ 3A3ED9D41225E32A009E2908 /* CTTabStripController.mm in Sources */,
3A3ED9D51225E32A009E2908 /* new_tab_button.mm in Sources */,
- 3A3ED9D61225E32A009E2908 /* tab_strip_model_observer_bridge.mm in Sources */,
+ 3A3ED9D61225E32A009E2908 /* CTTabStripModelObserverBridge.mm in Sources */,
3A3ED9D71225E32A009E2908 /* CTBrowserWindowController.mm in Sources */,
3A3ED9D81225E32A009E2908 /* fast_resize_view.mm in Sources */,
3A3ED9D91225E32A009E2908 /* CTBrowser.mm in Sources */,
View
@@ -1,6 +1,6 @@
#import "CTBrowser.h"
#import "CTTabStripModel.h"
-#import "tab_strip_controller.h"
+#import "CTTabStripController.h"
#import "CTPageTransition.h"
#import "CTBrowserWindowController.h"
#import "util.h"
@@ -1,7 +1,7 @@
#import <Cocoa/Cocoa.h>
#import "CTBrowser.h"
#import "CTTabStripModelDelegate.h"
-#import "tab_window_controller.h"
+#import "CTTabWindowController.h"
@class CTTabStripController;
class CTTabStripModelObserverBridge;
@@ -2,10 +2,10 @@
#import "CTTabStripModel.h"
-#import "tab_strip_controller.h"
-#import "tab_strip_model_observer_bridge.h"
+#import "CTTabStripController.h"
+#import "CTTabStripModelObserverBridge.h"
#import "CTTabView.h"
-#import "tab_strip_view.h"
+#import "CTTabStripView.h"
#import "fast_resize_view.h"
#import "scoped_nsdisable_screen_updates.h"
View
@@ -1,6 +1,6 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_BASICTYPES_H_
#define BASE_BASICTYPES_H_
@@ -1,6 +1,6 @@
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_COCOA_PROTOCOLS_MAC_H_
#define BASE_COCOA_PROTOCOLS_MAC_H_
View
@@ -1,6 +1,6 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_OBSERVER_LIST_H__
#define BASE_OBSERVER_LIST_H__
@@ -1,6 +1,6 @@
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_SCOPED_CFTYPEREF_H_
#define BASE_SCOPED_CFTYPEREF_H_
@@ -1,6 +1,6 @@
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_SCOPED_NSDISABLE_SCREEN_UPDATES_H_
#define BASE_SCOPED_NSDISABLE_SCREEN_UPDATES_H_
@@ -1,6 +1,6 @@
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef BASE_SCOPED_NSOBJECT_H_
#define BASE_SCOPED_NSOBJECT_H_
View
@@ -1,6 +1,6 @@
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
// Scopers help you manage ownership of a pointer, helping you easily manage the
// a pointer within a scope, and automatically destroying the pointer at the
View
@@ -1,6 +1,6 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
// STL utility functions. Usually, these replace built-in, but slow(!),
// STL functions with more efficient versions.
View
@@ -1,27 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,6 +1,6 @@
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef CHROME_BROWSER_COCOA_TAB_CONTENTS_CONTROLLER_H_
#define CHROME_BROWSER_COCOA_TAB_CONTENTS_CONTROLLER_H_
@@ -1,8 +1,8 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
-#import "tab_contents_controller.h"
+#import "CTTabContentsController.h"
#import "CTTabContents.h"
#import "util.h"
@@ -1,6 +1,6 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#ifndef CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_
#define CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_
@@ -1,6 +1,6 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-chromium file.
#import "CTTabController.h"
#import "CTTabControllerTarget.h"
Oops, something went wrong.

0 comments on commit 4da4ba1

Please sign in to comment.