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

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

Issue 2480813003: Reduce views::Border creation verbosity by promoting factory functions (Closed)
Patch Set: fix bad merge 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 | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/toolbar/app_menu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 tab_table_->SetModel(table_model_.get()); 323 tab_table_->SetModel(table_model_.get());
324 tab_table_->SetGrouper(this); 324 tab_table_->SetGrouper(this);
325 tab_table_->SetObserver(this); 325 tab_table_->SetObserver(this);
326 tab_table_->set_context_menu_controller(this); 326 tab_table_->set_context_menu_controller(this);
327 set_context_menu_controller(this); 327 set_context_menu_controller(this);
328 328
329 tab_table_parent_ = tab_table_->CreateParentIfNecessary(); 329 tab_table_parent_ = tab_table_->CreateParentIfNecessary();
330 AddChildView(tab_table_parent_); 330 AddChildView(tab_table_parent_);
331 331
332 SetLayoutManager(new views::FillLayout()); 332 SetLayoutManager(new views::FillLayout());
333 SetBorder(views::Border::CreateEmptyBorder(views::kPanelVertMargin, 333 SetBorder(views::CreateEmptyBorder(views::kPanelVertMargin,
334 views::kButtonHEdgeMarginNew, 0, 334 views::kButtonHEdgeMarginNew, 0,
335 views::kButtonHEdgeMarginNew)); 335 views::kButtonHEdgeMarginNew));
336 336
337 table_model_->RetrieveSavedColumnsSettingsAndUpdateTable(); 337 table_model_->RetrieveSavedColumnsSettingsAndUpdateTable();
338 338
339 AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN)); 339 AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
340 } 340 }
341 341
342 void TaskManagerView::InitAlwaysOnTopState() { 342 void TaskManagerView::InitAlwaysOnTopState() {
343 RetrieveSavedAlwaysOnTopState(); 343 RetrieveSavedAlwaysOnTopState();
344 GetWidget()->SetAlwaysOnTop(is_always_on_top_); 344 GetWidget()->SetAlwaysOnTop(is_always_on_top_);
345 } 345 }
(...skipping 17 matching lines...) Expand all
363 if (!g_browser_process->local_state()) 363 if (!g_browser_process->local_state())
364 return; 364 return;
365 365
366 const base::DictionaryValue* dictionary = 366 const base::DictionaryValue* dictionary =
367 g_browser_process->local_state()->GetDictionary(GetWindowName()); 367 g_browser_process->local_state()->GetDictionary(GetWindowName());
368 if (dictionary) 368 if (dictionary)
369 dictionary->GetBoolean("always_on_top", &is_always_on_top_); 369 dictionary->GetBoolean("always_on_top", &is_always_on_top_);
370 } 370 }
371 371
372 } // namespace task_manager 372 } // namespace task_manager
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/toolbar/app_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698