summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:59:09 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:59:09 +0000
commitbcec7fb666c9742f77462d276c65ffdc46e79780 (patch)
treeed4415aa4022ac3b4208d3d09d034578b266df87 /ash/display
parent47ed74585b6c76d92f804b3f2cb7a26804469a13 (diff)
downloadchromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.zip
chromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.tar.gz
chromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.tar.bz2
Renaming ui/display constants and variables from OUTPUT_* to DISPLAY_*
This moves all display configuration to using one terminology when referring to displays. BUG=333413 Review URL: https://codereview.chromium.org/227833002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
-rw-r--r--ash/display/display_change_observer_chromeos.cc42
-rw-r--r--ash/display/display_change_observer_chromeos.h2
-rw-r--r--ash/display/display_error_observer_chromeos.cc4
-rw-r--r--ash/display/display_error_observer_chromeos.h4
-rw-r--r--ash/display/display_error_observer_chromeos_unittest.cc11
-rw-r--r--ash/display/display_manager.cc5
-rw-r--r--ash/display/event_transformation_handler.cc3
-rw-r--r--ash/display/output_configurator_animation.cc2
-rw-r--r--ash/display/output_configurator_animation.h4
-rw-r--r--ash/display/projecting_observer_chromeos.cc9
-rw-r--r--ash/display/projecting_observer_chromeos_unittest.cc4
11 files changed, 47 insertions, 43 deletions
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 259232d..cfc2301 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -96,14 +96,14 @@ DisplayChangeObserver::~DisplayChangeObserver() {
Shell::GetInstance()->RemoveShellObserver(this);
}
-ui::OutputState DisplayChangeObserver::GetStateForDisplayIds(
+ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
const std::vector<int64>& display_ids) const {
CHECK_EQ(2U, display_ids.size());
DisplayIdPair pair = std::make_pair(display_ids[0], display_ids[1]);
DisplayLayout layout = Shell::GetInstance()->display_manager()->
layout_store()->GetRegisteredDisplayLayout(pair);
- return layout.mirrored ? ui::OUTPUT_STATE_DUAL_MIRROR :
- ui::OUTPUT_STATE_DUAL_EXTENDED;
+ return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR :
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
}
bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
@@ -118,40 +118,40 @@ bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
}
void DisplayChangeObserver::OnDisplayModeChanged(
- const std::vector<DisplayConfigurator::DisplayState>& outputs) {
+ const std::vector<DisplayConfigurator::DisplayState>& display_states) {
std::vector<DisplayInfo> displays;
std::set<int64> ids;
- for (size_t i = 0; i < outputs.size(); ++i) {
- const DisplayConfigurator::DisplayState& output = outputs[i];
+ for (size_t i = 0; i < display_states.size(); ++i) {
+ const DisplayConfigurator::DisplayState& state = display_states[i];
- if (output.display->type() == ui::OUTPUT_TYPE_INTERNAL &&
+ if (state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL &&
gfx::Display::InternalDisplayId() == gfx::Display::kInvalidDisplayID) {
- gfx::Display::SetInternalDisplayId(output.display->display_id());
+ gfx::Display::SetInternalDisplayId(state.display->display_id());
}
- const ui::DisplayMode* mode_info = output.display->current_mode();
+ const ui::DisplayMode* mode_info = state.display->current_mode();
if (!mode_info)
continue;
float device_scale_factor = 1.0f;
- if (!ui::IsDisplaySizeBlackListed(output.display->physical_size()) &&
+ if (!ui::IsDisplaySizeBlackListed(state.display->physical_size()) &&
(kInchInMm * mode_info->size().width() /
- output.display->physical_size().width()) > kHighDensityDPIThreshold) {
+ state.display->physical_size().width()) > kHighDensityDPIThreshold) {
device_scale_factor = 2.0f;
}
- gfx::Rect display_bounds(output.display->origin(), mode_info->size());
+ gfx::Rect display_bounds(state.display->origin(), mode_info->size());
- std::vector<DisplayMode> display_modes = GetDisplayModeList(output);
+ std::vector<DisplayMode> display_modes = GetDisplayModeList(state);
std::string name =
- output.display->type() == ui::OUTPUT_TYPE_INTERNAL
- ? l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
- output.display->display_name();
+ state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL ?
+ l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
+ state.display->display_name();
if (name.empty())
name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
- bool has_overscan = output.display->has_overscan();
- int64 id = output.display->display_id();
+ bool has_overscan = state.display->has_overscan();
+ int64 id = state.display->display_id();
ids.insert(id);
displays.push_back(DisplayInfo(id, name, has_overscan));
@@ -160,9 +160,9 @@ void DisplayChangeObserver::OnDisplayModeChanged(
new_info.SetBounds(display_bounds);
new_info.set_native(true);
new_info.set_display_modes(display_modes);
- new_info.set_touch_support(
- output.touch_device_id == 0 ? gfx::Display::TOUCH_SUPPORT_UNAVAILABLE :
- gfx::Display::TOUCH_SUPPORT_AVAILABLE);
+ new_info.set_touch_support(state.touch_device_id == 0 ?
+ gfx::Display::TOUCH_SUPPORT_UNAVAILABLE :
+ gfx::Display::TOUCH_SUPPORT_AVAILABLE);
new_info.set_available_color_profiles(
Shell::GetInstance()
->display_configurator()
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index 707c37f..1e6521f 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -28,7 +28,7 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
virtual ~DisplayChangeObserver();
// ui::DisplayConfigurator::StateController overrides:
- virtual ui::OutputState GetStateForDisplayIds(
+ virtual ui::MultipleDisplayState GetStateForDisplayIds(
const std::vector<int64>& outputs) const OVERRIDE;
virtual bool GetResolutionForDisplayId(int64 display_id,
gfx::Size* size) const OVERRIDE;
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc
index 72b7639..145bbc0 100644
--- a/ash/display/display_error_observer_chromeos.cc
+++ b/ash/display/display_error_observer_chromeos.cc
@@ -30,13 +30,13 @@ DisplayErrorObserver::~DisplayErrorObserver() {
}
void DisplayErrorObserver::OnDisplayModeChangeFailed(
- ui::OutputState new_state) {
+ ui::MultipleDisplayState new_state) {
// Always remove the notification to make sure the notification appears
// as a popup in any situation.
message_center::MessageCenter::Get()->RemoveNotification(
kDisplayErrorNotificationId, false /* by_user */);
- int message_id = (new_state == ui::OUTPUT_STATE_DUAL_MIRROR) ?
+ int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ?
IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;
diff --git a/ash/display/display_error_observer_chromeos.h b/ash/display/display_error_observer_chromeos.h
index d49060b..58de819 100644
--- a/ash/display/display_error_observer_chromeos.h
+++ b/ash/display/display_error_observer_chromeos.h
@@ -21,8 +21,8 @@ class ASH_EXPORT DisplayErrorObserver
virtual ~DisplayErrorObserver();
// ui::DisplayConfigurator::Observer overrides:
- virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state)
- OVERRIDE;
+ virtual void OnDisplayModeChangeFailed(
+ ui::MultipleDisplayState failed_new_state) OVERRIDE;
private:
friend class DisplayErrorObserverTest;
diff --git a/ash/display/display_error_observer_chromeos_unittest.cc b/ash/display/display_error_observer_chromeos_unittest.cc
index b43dd21..a1436f0 100644
--- a/ash/display/display_error_observer_chromeos_unittest.cc
+++ b/ash/display/display_error_observer_chromeos_unittest.cc
@@ -46,7 +46,7 @@ TEST_F(DisplayErrorObserverTest, Normal) {
return;
UpdateDisplay("200x200,300x300");
- observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR);
+ observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
GetMessageContents());
}
@@ -56,11 +56,11 @@ TEST_F(DisplayErrorObserverTest, CallTwice) {
return;
UpdateDisplay("200x200,300x300");
- observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR);
+ observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
base::string16 message = GetMessageContents();
EXPECT_FALSE(message.empty());
- observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR);
+ observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
base::string16 message2 = GetMessageContents();
EXPECT_FALSE(message2.empty());
EXPECT_EQ(message, message2);
@@ -71,11 +71,12 @@ TEST_F(DisplayErrorObserverTest, CallWithDifferentState) {
return;
UpdateDisplay("200x200,300x300");
- observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR);
+ observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
GetMessageContents());
- observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_EXTENDED);
+ observer()->OnDisplayModeChangeFailed(
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
GetMessageContents());
}
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 37eb0ee..32e0dea 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -864,8 +864,9 @@ void DisplayManager::SetMirrorMode(bool mirrored) {
#if defined(OS_CHROMEOS)
if (base::SysInfo::IsRunningOnChromeOS()) {
- ui::OutputState new_state = mirrored ? ui::OUTPUT_STATE_DUAL_MIRROR :
- ui::OUTPUT_STATE_DUAL_EXTENDED;
+ ui::MultipleDisplayState new_state =
+ mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR :
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
Shell::GetInstance()->display_configurator()->SetDisplayMode(new_state);
return;
}
diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
index 4591a7c..ef545fc 100644
--- a/ash/display/event_transformation_handler.cc
+++ b/ash/display/event_transformation_handler.cc
@@ -66,7 +66,8 @@ void EventTransformationHandler::OnTouchEvent(ui::TouchEvent* event) {
// Check display_configurator's output_state instead of checking
// DisplayManager::IsMirrored() because the compositor based mirroring
// won't cause the scaling issue.
- if (display_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
+ if (display_configurator->display_state() !=
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR)
return;
const std::map<int, float>& area_ratio_map =
diff --git a/ash/display/output_configurator_animation.cc b/ash/display/output_configurator_animation.cc
index 1a09018..f2aa252 100644
--- a/ash/display/output_configurator_animation.cc
+++ b/ash/display/output_configurator_animation.cc
@@ -209,7 +209,7 @@ void OutputConfiguratorAnimation::OnDisplayModeChanged(
}
void OutputConfiguratorAnimation::OnDisplayModeChangeFailed(
- ui::OutputState failed_new_state) {
+ ui::MultipleDisplayState failed_new_state) {
if (!hiding_layers_.empty())
StartFadeInAnimation();
}
diff --git a/ash/display/output_configurator_animation.h b/ash/display/output_configurator_animation.h
index 34bdfaf..e82217a 100644
--- a/ash/display/output_configurator_animation.h
+++ b/ash/display/output_configurator_animation.h
@@ -44,8 +44,8 @@ class ASH_EXPORT OutputConfiguratorAnimation
// ui::DisplayConfigurator::Observer overrides:
virtual void OnDisplayModeChanged(
const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
- virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state)
- OVERRIDE;
+ virtual void OnDisplayModeChangeFailed(
+ ui::MultipleDisplayState failed_new_state) OVERRIDE;
private:
// Clears all hiding layers. Note that in case that this method is called
diff --git a/ash/display/projecting_observer_chromeos.cc b/ash/display/projecting_observer_chromeos.cc
index d47ff29..404ff24 100644
--- a/ash/display/projecting_observer_chromeos.cc
+++ b/ash/display/projecting_observer_chromeos.cc
@@ -18,12 +18,13 @@ ProjectingObserver::ProjectingObserver()
ProjectingObserver::~ProjectingObserver() {}
void ProjectingObserver::OnDisplayModeChanged(
- const ui::DisplayConfigurator::DisplayStateList& outputs) {
+ const ui::DisplayConfigurator::DisplayStateList& display_states) {
has_internal_output_ = false;
- output_count_ = outputs.size();
+ output_count_ = display_states.size();
- for (size_t i = 0; i < outputs.size(); ++i) {
- if (outputs[i].display->type() == ui::OUTPUT_TYPE_INTERNAL) {
+ for (size_t i = 0; i < display_states.size(); ++i) {
+ if (display_states[i].display->type() ==
+ ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
has_internal_output_ = true;
break;
}
diff --git a/ash/display/projecting_observer_chromeos_unittest.cc b/ash/display/projecting_observer_chromeos_unittest.cc
index 5837202..3a72551 100644
--- a/ash/display/projecting_observer_chromeos_unittest.cc
+++ b/ash/display/projecting_observer_chromeos_unittest.cc
@@ -15,13 +15,13 @@ namespace {
ui::TestDisplaySnapshot* CreateInternalSnapshot() {
ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
- output->set_type(ui::OUTPUT_TYPE_INTERNAL);
+ output->set_type(ui::DISPLAY_CONNECTION_TYPE_INTERNAL);
return output;
}
ui::TestDisplaySnapshot* CreateVGASnapshot() {
ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
- output->set_type(ui::OUTPUT_TYPE_VGA);
+ output->set_type(ui::DISPLAY_CONNECTION_TYPE_VGA);
return output;
}
generated by cgit v1.1 at 2025-03-08 00:15:10 +0000