Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 1412803012: Revert "Indicate in the Window menu which Chrome window has an active sound playing" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1900 1900
1901 - (void)executeExtensionCommand:(const std::string&)extension_id 1901 - (void)executeExtensionCommand:(const std::string&)extension_id
1902 command:(const extensions::Command&)command { 1902 command:(const extensions::Command&)command {
1903 // Global commands are handled by the ExtensionCommandsGlobalRegistry 1903 // Global commands are handled by the ExtensionCommandsGlobalRegistry
1904 // instance. 1904 // instance.
1905 DCHECK(!command.global()); 1905 DCHECK(!command.global());
1906 extension_keybinding_registry_->ExecuteCommand(extension_id, 1906 extension_keybinding_registry_->ExecuteCommand(extension_id,
1907 command.accelerator()); 1907 command.accelerator());
1908 } 1908 }
1909 1909
1910 - (void)setMediaState:(TabMediaState)mediaState {
1911 static_cast<BrowserWindowCocoa*>([self browserWindow])
1912 ->UpdateMediaState(mediaState);
1913 }
1914
1915 - (TabMediaState)mediaState {
1916 return static_cast<BrowserWindowCocoa*>([self browserWindow])->media_state();
1917 }
1918
1919 @end // @implementation BrowserWindowController 1910 @end // @implementation BrowserWindowController
1920 1911
1921 @implementation BrowserWindowController(Fullscreen) 1912 @implementation BrowserWindowController(Fullscreen)
1922 1913
1923 - (void)handleLionToggleFullscreen { 1914 - (void)handleLionToggleFullscreen {
1924 DCHECK(base::mac::IsOSLionOrLater()); 1915 DCHECK(base::mac::IsOSLionOrLater());
1925 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN); 1916 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN);
1926 } 1917 }
1927 1918
1928 - (void)enterBrowserFullscreenWithToolbar:(BOOL)withToolbar { 1919 - (void)enterBrowserFullscreenWithToolbar:(BOOL)withToolbar {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 2078
2088 - (BOOL)supportsBookmarkBar { 2079 - (BOOL)supportsBookmarkBar {
2089 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2080 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2090 } 2081 }
2091 2082
2092 - (BOOL)isTabbedWindow { 2083 - (BOOL)isTabbedWindow {
2093 return browser_->is_type_tabbed(); 2084 return browser_->is_type_tabbed();
2094 } 2085 }
2095 2086
2096 @end // @implementation BrowserWindowController(WindowType) 2087 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698