OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_window_cocoa.h" | 5 #include "chrome/browser/cocoa/browser_window_cocoa.h" |
6 | 6 |
7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 | 395 |
396 void BrowserWindowCocoa::TabContentsFocused(TabContents* tab_contents) { | 396 void BrowserWindowCocoa::TabContentsFocused(TabContents* tab_contents) { |
397 NOTIMPLEMENTED(); | 397 NOTIMPLEMENTED(); |
398 } | 398 } |
399 | 399 |
400 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, | 400 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, |
401 const GURL& url, | 401 const GURL& url, |
402 const NavigationEntry::SSLStatus& ssl, | 402 const NavigationEntry::SSLStatus& ssl, |
403 bool show_history) { | 403 bool show_history) { |
404 const CommandLine* command_line(CommandLine::ForCurrentProcess()); | 404 const CommandLine* command_line(CommandLine::ForCurrentProcess()); |
405 if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble)) | 405 if (!command_line->HasSwitch(switches::kDisableNewPageInfoBubble)) |
406 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); | 406 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); |
407 else | 407 else |
408 browser::ShowPageInfo(window(), profile, url, ssl, show_history); | 408 browser::ShowPageInfo(window(), profile, url, ssl, show_history); |
409 } | 409 } |
410 | 410 |
411 void BrowserWindowCocoa::ShowAppMenu() { | 411 void BrowserWindowCocoa::ShowAppMenu() { |
412 // No-op. Mac doesn't support showing the menus via alt keys. | 412 // No-op. Mac doesn't support showing the menus via alt keys. |
413 } | 413 } |
414 | 414 |
415 bool BrowserWindowCocoa::PreHandleKeyboardEvent( | 415 bool BrowserWindowCocoa::PreHandleKeyboardEvent( |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 | 608 |
609 NSWindow* BrowserWindowCocoa::window() const { | 609 NSWindow* BrowserWindowCocoa::window() const { |
610 return [controller_ window]; | 610 return [controller_ window]; |
611 } | 611 } |
612 | 612 |
613 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { | 613 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { |
614 if (tab_contents == browser_->tabstrip_model()->GetSelectedTabContents()) { | 614 if (tab_contents == browser_->tabstrip_model()->GetSelectedTabContents()) { |
615 [controller_ updateSidebarForContents:tab_contents]; | 615 [controller_ updateSidebarForContents:tab_contents]; |
616 } | 616 } |
617 } | 617 } |
OLD | NEW |