| 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/bookmarks/bookmark_model.h" | 9 #import "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #import "chrome/browser/command_updater.h" | 10 #import "chrome/browser/command_updater.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 LocationBarBridge(TabContentsController* controller); | 58 LocationBarBridge(TabContentsController* controller); |
| 59 | 59 |
| 60 // Overridden from LocationBar | 60 // Overridden from LocationBar |
| 61 virtual void ShowFirstRunBubble() { NOTIMPLEMENTED(); } | 61 virtual void ShowFirstRunBubble() { NOTIMPLEMENTED(); } |
| 62 virtual std::wstring GetInputString() const; | 62 virtual std::wstring GetInputString() const; |
| 63 virtual WindowOpenDisposition GetWindowOpenDisposition() const | 63 virtual WindowOpenDisposition GetWindowOpenDisposition() const |
| 64 { NOTIMPLEMENTED(); return CURRENT_TAB; } | 64 { NOTIMPLEMENTED(); return CURRENT_TAB; } |
| 65 virtual PageTransition::Type GetPageTransition() const | 65 virtual PageTransition::Type GetPageTransition() const |
| 66 { NOTIMPLEMENTED(); return 0; } | 66 { NOTIMPLEMENTED(); return 0; } |
| 67 virtual void AcceptInput() { NOTIMPLEMENTED(); } | 67 virtual void AcceptInput() { NOTIMPLEMENTED(); } |
| 68 virtual void AcceptInputWithDisposition(WindowOpenDisposition disposition) |
| 69 { NOTIMPLEMENTED(); } |
| 68 virtual void FocusLocation(); | 70 virtual void FocusLocation(); |
| 69 virtual void FocusSearch() { NOTIMPLEMENTED(); } | 71 virtual void FocusSearch() { NOTIMPLEMENTED(); } |
| 70 virtual void UpdateFeedIcon() { /* http://crbug.com/8832 */ } | 72 virtual void UpdateFeedIcon() { /* http://crbug.com/8832 */ } |
| 71 virtual void SaveStateToContents(TabContents* contents) { NOTIMPLEMENTED(); } | 73 virtual void SaveStateToContents(TabContents* contents) { NOTIMPLEMENTED(); } |
| 72 | 74 |
| 73 private: | 75 private: |
| 74 TabContentsController* controller_; // weak, owns me | 76 TabContentsController* controller_; // weak, owns me |
| 75 }; | 77 }; |
| 76 | 78 |
| 77 @implementation TabContentsController | 79 @implementation TabContentsController |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 // over. | 320 // over. |
| 319 std::wstring url = base::SysNSStringToWide([controller_ locationBarString]); | 321 std::wstring url = base::SysNSStringToWide([controller_ locationBarString]); |
| 320 | 322 |
| 321 // Try to flesh out the input to make a real URL. | 323 // Try to flesh out the input to make a real URL. |
| 322 return URLFixerUpper::FixupURL(url, std::wstring()); | 324 return URLFixerUpper::FixupURL(url, std::wstring()); |
| 323 } | 325 } |
| 324 | 326 |
| 325 void LocationBarBridge::FocusLocation() { | 327 void LocationBarBridge::FocusLocation() { |
| 326 [controller_ focusLocationBar]; | 328 [controller_ focusLocationBar]; |
| 327 } | 329 } |
| OLD | NEW |