Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(787)

Side by Side Diff: ash/common/system/tray/tray_details_view.cc

Issue 2480353008: cros system menu - fix back and settings buttons in IME detailed view. (Closed)
Patch Set: lockdown Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/common/system/tray/tray_details_view.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/tray/tray_details_view.h" 5 #include "ash/common/system/tray/tray_details_view.h"
6 6
7 #include "ash/common/ash_view_ids.h" 7 #include "ash/common/ash_view_ids.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/system/tray/fixed_sized_scroll_view.h" 9 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
10 #include "ash/common/system/tray/system_tray.h" 10 #include "ash/common/system/tray/system_tray.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 progress_bar_ = new views::ProgressBar(kTitleRowProgressBarHeight); 347 progress_bar_ = new views::ProgressBar(kTitleRowProgressBarHeight);
348 progress_bar_->SetVisible(false); 348 progress_bar_->SetVisible(false);
349 AddChildViewAt(progress_bar_, kTitleRowSeparatorIndex + 1); 349 AddChildViewAt(progress_bar_, kTitleRowSeparatorIndex + 1);
350 } 350 }
351 351
352 progress_bar_->SetValue(value); 352 progress_bar_->SetValue(value);
353 progress_bar_->SetVisible(visible); 353 progress_bar_->SetVisible(visible);
354 child_at(kTitleRowSeparatorIndex)->SetVisible(!visible); 354 child_at(kTitleRowSeparatorIndex)->SetVisible(!visible);
355 } 355 }
356 356
357 void TrayDetailsView::HandleViewClicked(views::View* view) {} 357 void TrayDetailsView::HandleViewClicked(views::View* view) {
358 NOTREACHED();
359 }
358 360
359 void TrayDetailsView::HandleButtonPressed(views::Button* sender, 361 void TrayDetailsView::HandleButtonPressed(views::Button* sender,
360 const ui::Event& event) {} 362 const ui::Event& event) {
363 NOTREACHED();
364 }
361 365
362 void TrayDetailsView::CreateExtraTitleRowButtons() {} 366 void TrayDetailsView::CreateExtraTitleRowButtons() {}
363 367
364 void TrayDetailsView::TransitionToDefaultView() { 368 void TrayDetailsView::TransitionToDefaultView() {
365 // Cache pointer to owner in this function scope. TrayDetailsView will be 369 // Cache pointer to owner in this function scope. TrayDetailsView will be
366 // deleted after called ShowDefaultView. 370 // deleted after called ShowDefaultView.
367 SystemTrayItem* owner = owner_; 371 SystemTrayItem* owner = owner_;
368 if (UseMd()) { 372 if (UseMd()) {
369 if (back_button_ && back_button_->HasFocus()) 373 if (back_button_ && back_button_->HasFocus())
370 owner->set_restore_focus(true); 374 owner->set_restore_focus(true);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 if (index < child_count() - 1 && child_at(index + 1) != title_row_) 424 if (index < child_count() - 1 && child_at(index + 1) != title_row_)
421 scroll_border_->set_visible(true); 425 scroll_border_->set_visible(true);
422 else 426 else
423 scroll_border_->set_visible(false); 427 scroll_border_->set_visible(false);
424 } 428 }
425 429
426 views::View::OnPaintBorder(canvas); 430 views::View::OnPaintBorder(canvas);
427 } 431 }
428 432
429 } // namespace ash 433 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_details_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698