| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 7 #include "base/bind.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/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 | 439 |
| 440 void BrowserWindowCocoa::FocusBookmarksToolbar() { | 440 void BrowserWindowCocoa::FocusBookmarksToolbar() { |
| 441 // Not needed on the Mac. | 441 // Not needed on the Mac. |
| 442 } | 442 } |
| 443 | 443 |
| 444 void BrowserWindowCocoa::FocusInfobars() { | 444 void BrowserWindowCocoa::FocusInfobars() { |
| 445 // Not needed on the Mac. | 445 // Not needed on the Mac. |
| 446 } | 446 } |
| 447 | 447 |
| 448 bool BrowserWindowCocoa::IsBookmarkBarVisible() const { | 448 bool BrowserWindowCocoa::IsBookmarkBarVisible() const { |
| 449 return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar); | 449 return browser_->profile()->GetPrefs()->GetBoolean( |
| 450 bookmarks::prefs::kShowBookmarkBar); |
| 450 } | 451 } |
| 451 | 452 |
| 452 bool BrowserWindowCocoa::IsBookmarkBarAnimating() const { | 453 bool BrowserWindowCocoa::IsBookmarkBarAnimating() const { |
| 453 return [controller_ isBookmarkBarAnimating]; | 454 return [controller_ isBookmarkBarAnimating]; |
| 454 } | 455 } |
| 455 | 456 |
| 456 bool BrowserWindowCocoa::IsTabStripEditable() const { | 457 bool BrowserWindowCocoa::IsTabStripEditable() const { |
| 457 return ![controller_ isDragSessionActive]; | 458 return ![controller_ isDragSessionActive]; |
| 458 } | 459 } |
| 459 | 460 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 | 759 |
| 759 void BrowserWindowCocoa::ShowPageActionPopup( | 760 void BrowserWindowCocoa::ShowPageActionPopup( |
| 760 const extensions::Extension* extension) { | 761 const extensions::Extension* extension) { |
| 761 [cocoa_controller() activatePageAction:extension->id()]; | 762 [cocoa_controller() activatePageAction:extension->id()]; |
| 762 } | 763 } |
| 763 | 764 |
| 764 void BrowserWindowCocoa::ShowBrowserActionPopup( | 765 void BrowserWindowCocoa::ShowBrowserActionPopup( |
| 765 const extensions::Extension* extension) { | 766 const extensions::Extension* extension) { |
| 766 [cocoa_controller() activateBrowserAction:extension->id()]; | 767 [cocoa_controller() activateBrowserAction:extension->id()]; |
| 767 } | 768 } |
| OLD | NEW |