summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/app_lifetime_monitor.cc2
-rw-r--r--apps/app_lifetime_monitor.h1
-rw-r--r--apps/app_window_registry.cc10
-rw-r--r--apps/app_window_registry.h6
-rw-r--r--chrome/browser/apps/app_browsertest.cc2
-rw-r--r--chrome/browser/chromeos/app_mode/app_session_lifetime.cc2
-rw-r--r--chrome/browser/chromeos/login/app_launch_controller.cc2
-rw-r--r--chrome/browser/chromeos/login/test/app_window_waiter.cc4
-rw-r--r--chrome/browser/chromeos/login/test/app_window_waiter.h2
-rw-r--r--chrome/browser/chromeos/policy/device_local_account_browsertest.cc2
-rw-r--r--chrome/browser/extensions/api/app_window/app_window_apitest.cc2
-rw-r--r--chrome/browser/extensions/api/identity/web_auth_flow.cc2
-rw-r--r--chrome/browser/extensions/api/identity/web_auth_flow.h1
-rw-r--r--chrome/browser/policy/policy_browsertest.cc8
-rw-r--r--chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc8
-rw-r--r--chrome/browser/ui/ash/launcher/app_window_launcher_controller.h2
-rw-r--r--chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc4
-rw-r--r--chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc2
-rw-r--r--chrome/browser/ui/ash/system_tray_delegate_chromeos.cc6
-rw-r--r--chrome/browser/ui/ash/system_tray_delegate_chromeos.h2
20 files changed, 13 insertions, 57 deletions
diff --git a/apps/app_lifetime_monitor.cc b/apps/app_lifetime_monitor.cc
index 34aa701..83a3c56 100644
--- a/apps/app_lifetime_monitor.cc
+++ b/apps/app_lifetime_monitor.cc
@@ -88,8 +88,6 @@ void AppLifetimeMonitor::OnAppWindowAdded(AppWindow* app_window) {
NotifyAppActivated(app_window->extension_id());
}
-void AppLifetimeMonitor::OnAppWindowIconChanged(AppWindow* app_window) {}
-
void AppLifetimeMonitor::OnAppWindowRemoved(AppWindow* app_window) {
AppWindowRegistry::AppWindowList windows =
AppWindowRegistry::Get(app_window->browser_context())
diff --git a/apps/app_lifetime_monitor.h b/apps/app_lifetime_monitor.h
index fe63514..a9fed9c 100644
--- a/apps/app_lifetime_monitor.h
+++ b/apps/app_lifetime_monitor.h
@@ -63,7 +63,6 @@ class AppLifetimeMonitor : public KeyedService,
// AppWindowRegistry::Observer overrides:
virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE;
// KeyedService overrides:
diff --git a/apps/app_window_registry.cc b/apps/app_window_registry.cc
index 322ece9..cf4839a 100644
--- a/apps/app_window_registry.cc
+++ b/apps/app_window_registry.cc
@@ -45,6 +45,16 @@ std::string GetWindowKeyForRenderViewHost(
namespace apps {
+void AppWindowRegistry::Observer::OnAppWindowAdded(AppWindow* app_window) {
+}
+
+void AppWindowRegistry::Observer::OnAppWindowIconChanged(
+ AppWindow* app_window) {
+}
+
+void AppWindowRegistry::Observer::OnAppWindowRemoved(AppWindow* app_window) {
+}
+
void AppWindowRegistry::Observer::OnAppWindowHidden(AppWindow* app_window) {
}
diff --git a/apps/app_window_registry.h b/apps/app_window_registry.h
index ebde350..a055e1b 100644
--- a/apps/app_window_registry.h
+++ b/apps/app_window_registry.h
@@ -32,11 +32,11 @@ class AppWindowRegistry : public KeyedService {
class Observer {
public:
// Called just after a app window was added.
- virtual void OnAppWindowAdded(apps::AppWindow* app_window) = 0;
+ virtual void OnAppWindowAdded(apps::AppWindow* app_window);
// Called when the window icon changes.
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) = 0;
+ virtual void OnAppWindowIconChanged(apps::AppWindow* app_window);
// Called just after a app window was removed.
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) = 0;
+ virtual void OnAppWindowRemoved(apps::AppWindow* app_window);
// Called just after a app window was hidden. This is different from
// window visibility as a minimize does not hide a window, but does make
// it not visible.
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 0c44568e..6f1833e 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -1195,8 +1195,6 @@ class PlatformAppIncognitoBrowserTest : public PlatformAppBrowserTest,
virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE {
opener_app_ids_.insert(app_window->extension_id());
}
- virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE {}
- virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE {}
protected:
// A set of ids of apps we've seen open a app window.
diff --git a/chrome/browser/chromeos/app_mode/app_session_lifetime.cc b/chrome/browser/chromeos/app_mode/app_session_lifetime.cc
index 1f865d6..287473a 100644
--- a/chrome/browser/chromeos/app_mode/app_session_lifetime.cc
+++ b/chrome/browser/chromeos/app_mode/app_session_lifetime.cc
@@ -52,8 +52,6 @@ class AppWindowHandler : public AppWindowRegistry::Observer {
private:
// apps::AppWindowRegistry::Observer overrides:
- virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE {}
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE {}
virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {
if (window_registry_->app_windows().empty()) {
if (DemoAppLauncher::IsDemoAppSession(
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
index ad021b3..a277a58 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -86,8 +86,6 @@ class AppLaunchController::AppWindowWatcher
NotifyAppWindowCreated();
}
}
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE {}
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {}
void NotifyAppWindowCreated() {
controller_->OnAppWindowCreated();
diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.cc b/chrome/browser/chromeos/login/test/app_window_waiter.cc
index 5c69bb0..f9be212 100644
--- a/chrome/browser/chromeos/login/test/app_window_waiter.cc
+++ b/chrome/browser/chromeos/login/test/app_window_waiter.cc
@@ -38,8 +38,4 @@ void AppWindowWaiter::OnAppWindowAdded(apps::AppWindow* app_window) {
}
}
-void AppWindowWaiter::OnAppWindowIconChanged(apps::AppWindow* app_window) {}
-
-void AppWindowWaiter::OnAppWindowRemoved(apps::AppWindow* app_window) {}
-
} // namespace chromeos
diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.h b/chrome/browser/chromeos/login/test/app_window_waiter.h
index 3fcb9ec..3e796de 100644
--- a/chrome/browser/chromeos/login/test/app_window_waiter.h
+++ b/chrome/browser/chromeos/login/test/app_window_waiter.h
@@ -30,8 +30,6 @@ class AppWindowWaiter : public apps::AppWindowRegistry::Observer {
// AppWindowRegistry::Observer:
virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
private:
apps::AppWindowRegistry* registry_;
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index e439529..5edfd05 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -375,8 +375,6 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
run_loop_->Quit();
}
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE {}
-
virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {
if (run_loop_)
run_loop_->Quit();
diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
index 9f0f546..8b581579 100644
--- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
@@ -30,11 +30,9 @@ class TestAppWindowRegistryObserver : public apps::AppWindowRegistry::Observer {
}
// Overridden from AppWindowRegistry::Observer:
- virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE {}
virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE {
++icon_updates_;
}
- virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE {}
int icon_updates() { return icon_updates_; }
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc
index b49f20d..2a88e48 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.cc
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc
@@ -121,8 +121,6 @@ void WebAuthFlow::OnAppWindowAdded(AppWindow* app_window) {
}
}
-void WebAuthFlow::OnAppWindowIconChanged(AppWindow* app_window) {}
-
void WebAuthFlow::OnAppWindowRemoved(AppWindow* app_window) {
if (app_window->window_key() == app_window_key_ &&
app_window->extension_id() == extension_misc::kIdentityApiUiAppId) {
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h
index 169cc32..ba7e8ab 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.h
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.h
@@ -93,7 +93,6 @@ class WebAuthFlow : public content::NotificationObserver,
// ::AppWindowRegistry::Observer implementation.
virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
// NotificationObserver implementation.
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 53bbac9..08e397f 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -540,8 +540,6 @@ class TestAddAppWindowObserver : public apps::AppWindowRegistry::Observer {
// apps::AppWindowRegistry::Observer:
virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
apps::AppWindow* WaitForAppWindow();
@@ -568,12 +566,6 @@ void TestAddAppWindowObserver::OnAppWindowAdded(apps::AppWindow* app_window) {
run_loop_.Quit();
}
-void TestAddAppWindowObserver::OnAppWindowIconChanged(
- apps::AppWindow* app_window) {}
-
-void TestAddAppWindowObserver::OnAppWindowRemoved(apps::AppWindow* app_window) {
-}
-
apps::AppWindow* TestAddAppWindowObserver::WaitForAppWindow() {
run_loop_.Run();
return window_;
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
index 113ea8b..6dacb2e 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
@@ -84,9 +84,6 @@ void AppWindowLauncherController::AdditionalUserAddedToSession(
registry_.insert(registry);
}
-void AppWindowLauncherController::OnAppWindowAdded(AppWindow* app_window) {
-}
-
void AppWindowLauncherController::OnAppWindowIconChanged(
AppWindow* app_window) {
if (!ControlsWindow(app_window->GetNativeWindow()))
@@ -102,11 +99,6 @@ void AppWindowLauncherController::OnAppWindowIconChanged(
app_window->app_icon().AsImageSkia());
}
-void AppWindowLauncherController::OnAppWindowRemoved(AppWindow* app_window) {
- // Do nothing here; app_window->window() has already been deleted and
- // OnWindowDestroying() has been called, doing the removal.
-}
-
void AppWindowLauncherController::OnAppWindowShown(AppWindow* app_window) {
aura::Window* window = app_window->GetNativeWindow();
if (!ControlsWindow(window))
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
index 9ac4b9b..98dc5ea 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
@@ -50,9 +50,7 @@ class AppWindowLauncherController
virtual void AdditionalUserAddedToSession(Profile* profile);
// Overridden from AppWindowRegistry::Observer:
- virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowShown(apps::AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowHidden(apps::AppWindow* app_window) OVERRIDE;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 9b8d2cf..12a1133 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -92,14 +92,10 @@ class TestAppWindowRegistryObserver : public apps::AppWindowRegistry::Observer {
}
// Overridden from AppWindowRegistry::Observer:
- virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE {}
-
virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE {
++icon_updates_;
}
- virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE {}
-
int icon_updates() { return icon_updates_; }
private:
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index 452eacc..8ddeb0e 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -198,8 +198,6 @@ class AppObserver : public apps::AppWindowRegistry::Observer {
MultiUserWindowManagerChromeOS::GetInstance()->SetWindowOwner(window,
user_id_);
}
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE {}
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {}
private:
std::string user_id_;
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 02eaccd..9d39bac 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -1399,12 +1399,6 @@ void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) {
}
// Overridden from apps::AppWindowRegistry::Observer.
-void SystemTrayDelegateChromeOS::OnAppWindowAdded(apps::AppWindow* app_window) {
-}
-
-void SystemTrayDelegateChromeOS::OnAppWindowIconChanged(
- apps::AppWindow* app_window) {}
-
void SystemTrayDelegateChromeOS::OnAppWindowRemoved(
apps::AppWindow* app_window) {
NotifyIfLastWindowClosed();
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 378df87..5064860 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -254,8 +254,6 @@ class SystemTrayDelegateChromeOS
virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
// Overridden from apps::AppWindowRegistry::Observer:
- virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
void OnAccessibilityStatusChanged(
generated by cgit v1.1 at 2025-01-26 12:35:59 +0000