| OLD | NEW |
| 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 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 } | 424 } |
| 425 | 425 |
| 426 void BrowserWindowCocoa::TabContentsFocused(TabContents* tab_contents) { | 426 void BrowserWindowCocoa::TabContentsFocused(TabContents* tab_contents) { |
| 427 NOTIMPLEMENTED(); | 427 NOTIMPLEMENTED(); |
| 428 } | 428 } |
| 429 | 429 |
| 430 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, | 430 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, |
| 431 const GURL& url, | 431 const GURL& url, |
| 432 const NavigationEntry::SSLStatus& ssl, | 432 const NavigationEntry::SSLStatus& ssl, |
| 433 bool show_history) { | 433 bool show_history) { |
| 434 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); | 434 browser::ShowPageInfoBubble(browser_, profile, url, ssl, show_history); |
| 435 } | 435 } |
| 436 | 436 |
| 437 void BrowserWindowCocoa::ShowAppMenu() { | 437 void BrowserWindowCocoa::ShowAppMenu() { |
| 438 // No-op. Mac doesn't support showing the menus via alt keys. | 438 // No-op. Mac doesn't support showing the menus via alt keys. |
| 439 } | 439 } |
| 440 | 440 |
| 441 bool BrowserWindowCocoa::PreHandleKeyboardEvent( | 441 bool BrowserWindowCocoa::PreHandleKeyboardEvent( |
| 442 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { | 442 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { |
| 443 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) | 443 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) |
| 444 return false; | 444 return false; |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 | 569 |
| 570 NSWindow* BrowserWindowCocoa::window() const { | 570 NSWindow* BrowserWindowCocoa::window() const { |
| 571 return [controller_ window]; | 571 return [controller_ window]; |
| 572 } | 572 } |
| 573 | 573 |
| 574 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { | 574 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { |
| 575 if (tab_contents == browser_->GetSelectedTabContents()) { | 575 if (tab_contents == browser_->GetSelectedTabContents()) { |
| 576 [controller_ updateSidebarForContents:tab_contents]; | 576 [controller_ updateSidebarForContents:tab_contents]; |
| 577 } | 577 } |
| 578 } | 578 } |
| OLD | NEW |