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

Side by Side Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 2713803002: Views/Harmony: Use LayoutDelegate::GetMetric for views::kPanelVertMargin. (Closed)
Patch Set: Rebase. Created 3 years, 9 months 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/ui/views/task_manager_view.h" 5 #include "chrome/browser/ui/views/task_manager_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/profiles/profile_window.h" 12 #include "chrome/browser/profiles/profile_window.h"
13 #include "chrome/browser/task_manager/task_manager_interface.h" 13 #include "chrome/browser/task_manager/task_manager_interface.h"
14 #include "chrome/browser/task_manager/task_manager_observer.h" 14 #include "chrome/browser/task_manager/task_manager_observer.h"
15 #include "chrome/browser/ui/browser_finder.h" 15 #include "chrome/browser/ui/browser_finder.h"
16 #include "chrome/browser/ui/browser_navigator_params.h" 16 #include "chrome/browser/ui/browser_navigator_params.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/ui/task_manager/task_manager_columns.h" 18 #include "chrome/browser/ui/task_manager/task_manager_columns.h"
19 #include "chrome/browser/ui/user_manager.h" 19 #include "chrome/browser/ui/user_manager.h"
20 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
20 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
21 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
22 #include "chrome/grit/chromium_strings.h" 23 #include "chrome/grit/chromium_strings.h"
23 #include "chrome/grit/generated_resources.h" 24 #include "chrome/grit/generated_resources.h"
24 #include "components/prefs/pref_service.h" 25 #include "components/prefs/pref_service.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/models/table_model_observer.h" 27 #include "ui/base/models/table_model_observer.h"
27 #include "ui/views/border.h" 28 #include "ui/views/border.h"
28 #include "ui/views/controls/label.h" 29 #include "ui/views/controls/label.h"
29 #include "ui/views/controls/table/table_view.h" 30 #include "ui/views/controls/table/table_view.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 tab_table_->SetModel(table_model_.get()); 326 tab_table_->SetModel(table_model_.get());
326 tab_table_->SetGrouper(this); 327 tab_table_->SetGrouper(this);
327 tab_table_->set_observer(this); 328 tab_table_->set_observer(this);
328 tab_table_->set_context_menu_controller(this); 329 tab_table_->set_context_menu_controller(this);
329 set_context_menu_controller(this); 330 set_context_menu_controller(this);
330 331
331 tab_table_parent_ = tab_table_->CreateParentIfNecessary(); 332 tab_table_parent_ = tab_table_->CreateParentIfNecessary();
332 AddChildView(tab_table_parent_); 333 AddChildView(tab_table_parent_);
333 334
334 SetLayoutManager(new views::FillLayout()); 335 SetLayoutManager(new views::FillLayout());
335 SetBorder(views::CreateEmptyBorder(views::kPanelVertMargin, 336 SetBorder(views::CreateEmptyBorder(
336 views::kButtonHEdgeMarginNew, 0, 337 LayoutDelegate::Get()->GetMetric(
337 views::kButtonHEdgeMarginNew)); 338 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),
339 views::kButtonHEdgeMarginNew, 0, views::kButtonHEdgeMarginNew));
338 340
339 table_model_->RetrieveSavedColumnsSettingsAndUpdateTable(); 341 table_model_->RetrieveSavedColumnsSettingsAndUpdateTable();
340 342
341 AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN)); 343 AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
342 } 344 }
343 345
344 void TaskManagerView::InitAlwaysOnTopState() { 346 void TaskManagerView::InitAlwaysOnTopState() {
345 RetrieveSavedAlwaysOnTopState(); 347 RetrieveSavedAlwaysOnTopState();
346 GetWidget()->SetAlwaysOnTop(is_always_on_top_); 348 GetWidget()->SetAlwaysOnTop(is_always_on_top_);
347 } 349 }
(...skipping 17 matching lines...) Expand all
365 if (!g_browser_process->local_state()) 367 if (!g_browser_process->local_state())
366 return; 368 return;
367 369
368 const base::DictionaryValue* dictionary = 370 const base::DictionaryValue* dictionary =
369 g_browser_process->local_state()->GetDictionary(GetWindowName()); 371 g_browser_process->local_state()->GetDictionary(GetWindowName());
370 if (dictionary) 372 if (dictionary)
371 dictionary->GetBoolean("always_on_top", &is_always_on_top_); 373 dictionary->GetBoolean("always_on_top", &is_always_on_top_);
372 } 374 }
373 375
374 } // namespace task_manager 376 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698