summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-07-24 16:35:01 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 23:35:56 +0000
commit6713cc79b432a3de02bd4c08dceaf1d187a9c431 (patch)
tree31601ad45b7dd44681178f60fd0831b2ba880700 /ui
parent0570e9bab6c91b34ae3329383f3ae1097a98c29d (diff)
downloadchromium_src-6713cc79b432a3de02bd4c08dceaf1d187a9c431.zip
chromium_src-6713cc79b432a3de02bd4c08dceaf1d187a9c431.tar.gz
chromium_src-6713cc79b432a3de02bd4c08dceaf1d187a9c431.tar.bz2
Fix -Wswitch warnings in //ui.
BUG=505308 Review URL: https://codereview.chromium.org/1256023002 Cr-Commit-Position: refs/heads/master@{#340378}
Diffstat (limited to 'ui')
-rw-r--r--ui/gl/gl_surface_win.cc7
-rw-r--r--ui/native_theme/native_theme_aurawin.cc3
-rw-r--r--ui/native_theme/native_theme_win.cc5
3 files changed, 12 insertions, 3 deletions
diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc
index c416e6b..93410ca 100644
--- a/ui/gl/gl_surface_win.cc
+++ b/ui/gl/gl_surface_win.cc
@@ -171,6 +171,13 @@ bool GLSurface::InitializeOneOffInternal() {
return false;
}
break;
+ case kGLImplementationNone:
+ case kGLImplementationDesktopGLCoreProfile:
+ case kGLImplementationAppleGL:
+ NOTREACHED();
+ case kGLImplementationOSMesaGL:
+ case kGLImplementationMockGL:
+ break;
}
return true;
}
diff --git a/ui/native_theme/native_theme_aurawin.cc b/ui/native_theme/native_theme_aurawin.cc
index 3cc01e5..1730de1 100644
--- a/ui/native_theme/native_theme_aurawin.cc
+++ b/ui/native_theme/native_theme_aurawin.cc
@@ -26,8 +26,9 @@ bool IsScrollbarPart(NativeTheme::Part part) {
case NativeTheme::kScrollbarVerticalGripper:
case NativeTheme::kScrollbarCorner:
return true;
+ default:
+ return false;
}
- return false;
}
} // namespace
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 89f88b9..0ffcbd1 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -666,9 +666,10 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
case kColorId_ResultsTableNegativeSelectedText:
return color_utils::GetReadableColor(kNegativeTextColor,
system_colors_[COLOR_HIGHLIGHT]);
+ default:
+ NOTREACHED();
+ return kInvalidColorIdColor;
}
- NOTREACHED();
- return kInvalidColorIdColor;
}
void NativeThemeWin::PaintIndirect(SkCanvas* canvas,