| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "chrome/browser/cocoa/tab_contents_controller.h" | 5 #include "chrome/browser/cocoa/tab_contents_controller.h" |
| 6 | 6 |
| 7 #import "base/sys_string_conversions.h" | 7 #import "base/sys_string_conversions.h" |
| 8 #import "chrome/app/chrome_dll_resource.h" | 8 #import "chrome/app/chrome_dll_resource.h" |
| 9 #import "chrome/browser/command_updater.h" | 9 #import "chrome/browser/command_updater.h" |
| 10 #import "chrome/browser/location_bar.h" | 10 #import "chrome/browser/location_bar.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 // Overridden from LocationBar | 57 // Overridden from LocationBar |
| 58 virtual void ShowFirstRunBubble() { NOTIMPLEMENTED(); } | 58 virtual void ShowFirstRunBubble() { NOTIMPLEMENTED(); } |
| 59 virtual std::wstring GetInputString() const; | 59 virtual std::wstring GetInputString() const; |
| 60 virtual WindowOpenDisposition GetWindowOpenDisposition() const | 60 virtual WindowOpenDisposition GetWindowOpenDisposition() const |
| 61 { NOTIMPLEMENTED(); return CURRENT_TAB; } | 61 { NOTIMPLEMENTED(); return CURRENT_TAB; } |
| 62 virtual PageTransition::Type GetPageTransition() const | 62 virtual PageTransition::Type GetPageTransition() const |
| 63 { NOTIMPLEMENTED(); return 0; } | 63 { NOTIMPLEMENTED(); return 0; } |
| 64 virtual void AcceptInput() { NOTIMPLEMENTED(); } | 64 virtual void AcceptInput() { NOTIMPLEMENTED(); } |
| 65 virtual void FocusLocation(); | 65 virtual void FocusLocation(); |
| 66 virtual void FocusSearch() { NOTIMPLEMENTED(); } | 66 virtual void FocusSearch() { NOTIMPLEMENTED(); } |
| 67 virtual void UpdateFeedIcon() { NOTIMPLEMENTED(); } |
| 67 virtual void SaveStateToContents(TabContents* contents) { NOTIMPLEMENTED(); } | 68 virtual void SaveStateToContents(TabContents* contents) { NOTIMPLEMENTED(); } |
| 68 | 69 |
| 69 private: | 70 private: |
| 70 TabContentsController* controller_; // weak, owns me | 71 TabContentsController* controller_; // weak, owns me |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 @implementation TabContentsController | 74 @implementation TabContentsController |
| 74 | 75 |
| 75 - (id)initWithNibName:(NSString*)name | 76 - (id)initWithNibName:(NSString*)name |
| 76 bundle:(NSBundle*)bundle | 77 bundle:(NSBundle*)bundle |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 : controller_(controller) { | 266 : controller_(controller) { |
| 266 } | 267 } |
| 267 | 268 |
| 268 std::wstring LocationBarBridge::GetInputString() const { | 269 std::wstring LocationBarBridge::GetInputString() const { |
| 269 return base::SysNSStringToWide([controller_ locationBarString]); | 270 return base::SysNSStringToWide([controller_ locationBarString]); |
| 270 } | 271 } |
| 271 | 272 |
| 272 void LocationBarBridge::FocusLocation() { | 273 void LocationBarBridge::FocusLocation() { |
| 273 [controller_ focusLocationBar]; | 274 [controller_ focusLocationBar]; |
| 274 } | 275 } |
| OLD | NEW |