Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc
index 2b48256..1ff6014 100644
--- a/chrome/browser/chromeos/notifications/notification_panel.cc
+++ b/chrome/browser/chromeos/notifications/notification_panel.cc
@@ -271,7 +271,7 @@ namespace chromeos {
 
 class BalloonContainer : public views::View {
  public:
-  BalloonContainer(int margin)
+  explicit BalloonContainer(int margin)
       : margin_(margin),
         sticky_container_(new BalloonSubContainer(margin)),
         non_sticky_container_(new BalloonSubContainer(margin)) {
@@ -700,7 +700,7 @@ void NotificationPanel::ScrollBalloonToVisible(Balloon* balloon) {
 void NotificationPanel::UpdatePanel(bool update_container_size) {
   if (update_container_size)
     UpdateContainerBounds();
-  switch(state_) {
+  switch (state_) {
     case KEEP_SIZE: {
       gfx::Rect min_bounds = GetPreferredBounds();
       gfx::Rect panel_bounds;
@@ -806,8 +806,8 @@ void NotificationPanel::OnStale(BalloonViewImpl* view) {
 
 void NotificationPanel::SetState(State new_state, const char* name) {
 #if !defined(NDEBUG)
-  DLOG(INFO) << "state transition " << ToStr(state_) << " >> "
-             << ToStr(new_state) << " in " << name;
+  DVLOG(1) << "state transition " << ToStr(state_) << " >> " << ToStr(new_state)
+           << " in " << name;
 #endif
   state_ = new_state;
 }