diff options
Diffstat (limited to 'chrome')
5 files changed, 16 insertions, 19 deletions
diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/chrome/browser/extensions/api/system_info/system_info_api.cc index 99f49f5..7c76083 100644 --- a/chrome/browser/extensions/api/system_info/system_info_api.cc +++ b/chrome/browser/extensions/api/system_info/system_info_api.cc @@ -66,10 +66,9 @@ class SystemInfoEventRouter : public gfx::DisplayObserver, private: // gfx::DisplayObserver: + virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; - virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; // RemovableStorageObserver implementation. virtual void OnRemovableStorageAttached( @@ -183,16 +182,16 @@ void SystemInfoEventRouter::OnRemovableStorageDetached( DispatchEvent(system_storage::OnDetached::kEventName, args.Pass()); } -void SystemInfoEventRouter::OnDisplayAdded(const gfx::Display& new_display) { +void SystemInfoEventRouter::OnDisplayBoundsChanged( + const gfx::Display& display) { OnDisplayChanged(); } -void SystemInfoEventRouter::OnDisplayRemoved(const gfx::Display& old_display) { +void SystemInfoEventRouter::OnDisplayAdded(const gfx::Display& new_display) { OnDisplayChanged(); } -void SystemInfoEventRouter::OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) { +void SystemInfoEventRouter::OnDisplayRemoved(const gfx::Display& old_display) { OnDisplayChanged(); } diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc index a2a296f..36b1935 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc @@ -224,6 +224,11 @@ void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) { UpdateBrowserItemState(); } +void BrowserStatusMonitor::OnDisplayBoundsChanged( + const gfx::Display& display) { + // Do nothing here. +} + void BrowserStatusMonitor::OnDisplayAdded(const gfx::Display& new_display) { // Add a new RootWindow and its ActivationClient to observed list. aura::Window* root_window = ash::Shell::GetInstance()-> @@ -244,11 +249,6 @@ void BrowserStatusMonitor::OnDisplayRemoved(const gfx::Display& old_display) { // Do nothing here. } -void BrowserStatusMonitor::OnDisplayMetricsChanged(const gfx::Display&, - uint32_t) { - // Do nothing here. -} - void BrowserStatusMonitor::ActiveTabChanged(content::WebContents* old_contents, content::WebContents* new_contents, int index, diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.h b/chrome/browser/ui/ash/launcher/browser_status_monitor.h index 8b46002..426ef6e 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.h +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.h @@ -67,10 +67,9 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver, virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; // gfx::DisplayObserver overrides: + virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; - virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; // TabStripModelObserver overrides: virtual void ActiveTabChanged(content::WebContents* old_contents, diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc index d7d5d92..c176b0b 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc @@ -81,6 +81,10 @@ void DisplayOverscanHandler::RegisterMessages() { base::Unretained(this))); } +void DisplayOverscanHandler::OnDisplayBoundsChanged( + const gfx::Display& display) { +} + void DisplayOverscanHandler::OnDisplayAdded(const gfx::Display& new_display) { web_ui()->CallJavascriptFunction( "options.DisplayOverscan.onOverscanCanceled"); @@ -91,10 +95,6 @@ void DisplayOverscanHandler::OnDisplayRemoved(const gfx::Display& old_display) { "options.DisplayOverscan.onOverscanCanceled"); } -void DisplayOverscanHandler::OnDisplayMetricsChanged(const gfx::Display&, - uint32_t) { -} - void DisplayOverscanHandler::HandleStart(const base::ListValue* args) { int64 display_id = gfx::Display::kInvalidDisplayID; std::string id_value; diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h index dbb4787..65658a0 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h @@ -34,10 +34,9 @@ class DisplayOverscanHandler : public ::options::OptionsPageUIHandler, virtual void RegisterMessages() OVERRIDE; // gfx::DisplayObserver implementation. + virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; - virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; private: // Handlers of JS messages. |