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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: 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"
(...skipping 17 matching lines...) Expand all
28 #include "ui/views/controls/label.h" 28 #include "ui/views/controls/label.h"
29 #include "ui/views/controls/table/table_view.h" 29 #include "ui/views/controls/table/table_view.h"
30 #include "ui/views/layout/fill_layout.h" 30 #include "ui/views/layout/fill_layout.h"
31 #include "ui/views/layout/layout_constants.h" 31 #include "ui/views/layout/layout_constants.h"
32 #include "ui/views/view.h" 32 #include "ui/views/view.h"
33 #include "ui/views/widget/widget.h" 33 #include "ui/views/widget/widget.h"
34 #include "ui/views/window/dialog_client_view.h" 34 #include "ui/views/window/dialog_client_view.h"
35 35
36 #if defined(USE_ASH) 36 #if defined(USE_ASH)
37 // Note: gn check complains here, despite the correct conditional //ash dep. 37 // Note: gn check complains here, despite the correct conditional //ash dep.
38 #include "ash/common/shelf/shelf_item_types.h" // nogncheck
39 #include "ash/public/cpp/window_properties.h" // nogncheck 38 #include "ash/public/cpp/window_properties.h" // nogncheck
40 #include "ash/resources/grit/ash_resources.h" // nogncheck 39 #include "ash/resources/grit/ash_resources.h" // nogncheck
40 #include "ash/shelf/shelf_item_types.h" // nogncheck
41 #include "ash/wm/window_util.h" // nogncheck 41 #include "ash/wm/window_util.h" // nogncheck
42 #include "chrome/browser/ui/ash/ash_util.h" // nogncheck 42 #include "chrome/browser/ui/ash/ash_util.h" // nogncheck
43 #include "ui/aura/client/aura_constants.h" 43 #include "ui/aura/client/aura_constants.h"
44 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/gfx/image/image_skia.h" 45 #include "ui/gfx/image/image_skia.h"
46 #endif // defined(USE_ASH) 46 #endif // defined(USE_ASH)
47 47
48 #if defined(OS_WIN) 48 #if defined(OS_WIN)
49 #include "chrome/browser/shell_integration_win.h" 49 #include "chrome/browser/shell_integration_win.h"
50 #include "ui/base/win/shell.h" 50 #include "ui/base/win/shell.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 if (!g_browser_process->local_state()) 365 if (!g_browser_process->local_state())
366 return; 366 return;
367 367
368 const base::DictionaryValue* dictionary = 368 const base::DictionaryValue* dictionary =
369 g_browser_process->local_state()->GetDictionary(GetWindowName()); 369 g_browser_process->local_state()->GetDictionary(GetWindowName());
370 if (dictionary) 370 if (dictionary)
371 dictionary->GetBoolean("always_on_top", &is_always_on_top_); 371 dictionary->GetBoolean("always_on_top", &is_always_on_top_);
372 } 372 }
373 373
374 } // namespace task_manager 374 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698