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

Side by Side Diff: chrome/browser/ui/ash/launcher/settings_window_observer.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ash/launcher/settings_window_observer.h" 5 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
6 6
7 #include "ash/common/shelf/shelf_item_types.h"
8 #include "ash/public/cpp/window_properties.h" 7 #include "ash/public/cpp/window_properties.h"
9 #include "ash/resources/grit/ash_resources.h" 8 #include "ash/resources/grit/ash_resources.h"
9 #include "ash/shelf/shelf_item_types.h"
10 #include "base/feature_list.h" 10 #include "base/feature_list.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/settings_window_manager.h" 14 #include "chrome/browser/ui/settings_window_manager.h"
15 #include "chrome/common/chrome_features.h" 15 #include "chrome/common/chrome_features.h"
16 #include "components/strings/grit/components_strings.h" 16 #include "components/strings/grit/components_strings.h"
17 #include "services/ui/public/interfaces/window_manager.mojom.h" 17 #include "services/ui/public/interfaces/window_manager.mojom.h"
18 #include "ui/aura/client/aura_constants.h" 18 #include "ui/aura/client/aura_constants.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG); 57 window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
58 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 58 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
59 gfx::ImageSkia* icon = 59 gfx::ImageSkia* icon =
60 base::FeatureList::IsEnabled(features::kMaterialDesignSettings) 60 base::FeatureList::IsEnabled(features::kMaterialDesignSettings)
61 ? rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_MD_SETTINGS) 61 ? rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_MD_SETTINGS)
62 : rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_SETTINGS); 62 : rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_SETTINGS);
63 // The new gfx::ImageSkia instance is owned by the window itself. 63 // The new gfx::ImageSkia instance is owned by the window itself.
64 window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(*icon)); 64 window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(*icon));
65 aura_window_tracker_->Add(window); 65 aura_window_tracker_->Add(window);
66 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698