diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 06:42:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 06:42:39 +0000 |
| commit | 945ece96bfd8a4d239f967d329bfd6a102659c66 (patch) | |
| tree | 2e74c8a932f04cd833bd5d439ef225d4ec63d4db /ash/shell.h | |
| parent | ea367c52cfaf6bfa3e96caa61de556471cbd08c9 (diff) | |
| download | chromium_src-945ece96bfd8a4d239f967d329bfd6a102659c66.zip chromium_src-945ece96bfd8a4d239f967d329bfd6a102659c66.tar.gz chromium_src-945ece96bfd8a4d239f967d329bfd6a102659c66.tar.bz2 | |
Refactor DisplayPreference
- Use ash::DisplayController::Observer to save preference
- DisplayLayout::FromInets to eliminate conversions
- Create OutputConfiguratorAnimation on desktop, except for test.
This is necessary to get options page working on desktop.
- Store default only when a user modified the layout. I think this matches
the user's expectation better.
Other cleanups:
- Removed unused declaration Shell::InitLayoutManagersForPrimaryDisplay
BUG=196818
TEST=covered by test
Review URL: https://codereview.chromium.org/12843008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ash/shell.h b/ash/shell.h index 1b659b8..7e3fab3c 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -425,6 +425,7 @@ class ASH_EXPORT Shell void DoInitialWorkspaceAnimation(); #if defined(OS_CHROMEOS) + // TODO(oshima): Move these objects to DisplayController. chromeos::OutputConfigurator* output_configurator() { return output_configurator_.get(); } @@ -466,11 +467,6 @@ class ASH_EXPORT Shell // can host browser windows. void InitRootWindowController(internal::RootWindowController* root); - // Initializes the layout managers and event filters specific for - // primary display. - void InitLayoutManagersForPrimaryDisplay( - internal::RootWindowController* root_window_controller); - // ash::internal::SystemModalContainerEventFilterDelegate overrides: virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; |