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

Side by Side Diff: ash/system/status_area_widget_delegate.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/settings/tray_settings.cc ('k') | ash/system/tray/tray_item_more.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 (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/system/status_area_widget_delegate.h" 5 #include "ash/system/status_area_widget_delegate.h"
6 6
7 #include "ash/ash_export.h" 7 #include "ash/ash_export.h"
8 #include "ash/focus_cycler.h" 8 #include "ash/focus_cycler.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "grit/ui_resources.h"
13 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
14 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
17 #include "ui/views/accessible_pane_view.h" 16 #include "ui/views/accessible_pane_view.h"
18 #include "ui/views/layout/grid_layout.h" 17 #include "ui/views/layout/grid_layout.h"
19 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
20 19
21 namespace { 20 namespace {
22 21
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 UpdateWidgetSize(); 125 UpdateWidgetSize();
127 } 126 }
128 127
129 void StatusAreaWidgetDelegate::UpdateWidgetSize() { 128 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
130 if (GetWidget()) 129 if (GetWidget())
131 GetWidget()->SetSize(GetPreferredSize()); 130 GetWidget()->SetSize(GetPreferredSize());
132 } 131 }
133 132
134 } // namespace internal 133 } // namespace internal
135 } // namespace ash 134 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/settings/tray_settings.cc ('k') | ash/system/tray/tray_item_more.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698