TestScreen shouldn't be marked aura export

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
+#include "ash/screen_ash.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/network/tray_network.h"
 #include "ash/system/power/power_status_controller.h"
 #include "ash/system/power/tray_power_date.h"
 #include "ash/system/settings/tray_settings.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 274 matching lines @@
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : root_window_(new aura::RootWindow),
+      screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
       network_controller_(NULL),
       power_status_controller_(NULL),
       shelf_(NULL),
       desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
+  gfx::Screen::SetInstance(screen_);
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
@@ skipping 261 matching lines @@
   frame_view->Init(widget);
   return frame_view;
 }
 
 void Shell::RotateFocus(Direction direction) {
   focus_cycler_->RotateFocus(
       direction == FORWARD ? internal::FocusCycler::FORWARD :
                              internal::FocusCycler::BACKWARD);
 }
 
+void Shell::SetScreenWorkAreaInsets(const gfx::Insets& insets) {
+  if (screen_->work_area_insets() == insets)
+    return;
+  screen_->set_work_area_insets(insets);
+  FOR_EACH_OBSERVER(ShellObserver, observers_,
+                    OnScreenWorkAreaInsetsChanged());
+}
+
+void Shell::AddShellObserver(ShellObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void Shell::RemoveShellObserver(ShellObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 void Shell::InitLayoutManagers() {
   DCHECK(root_window_layout_);
   DCHECK(status_widget_);
 
   internal::ShelfLayoutManager* shelf_layout_manager =
       new internal::ShelfLayoutManager(launcher_->widget(), status_widget_);
   GetContainer(internal::kShellWindowId_LauncherContainer)->
@@ skipping 18 matching lines @@
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash