ash/system/locale/tray_locale.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/locale/tray_locale.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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

OLD	NEW
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/locale/tray_locale.h"	5 #include "ash/system/locale/tray_locale.h"

6	6

7 #include "ash/system/tray/tray_constants.h"	7 #include "ash/system/tray/tray_constants.h"

8 #include "ash/system/tray/tray_notification_view.h"	8 #include "ash/system/tray/tray_notification_view.h"

9 #include "ash/system/tray/tray_views.h"	9 #include "ash/system/tray/tray_views.h"

10 #include "base/string16.h"	10 #include "base/string16.h"

11 #include "grit/ash_strings.h"	11 #include "grit/ash_strings.h"

12 #include "grit/ui_resources_standard.h"	12 #include "grit/ui_resources.h"

13 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

14 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

15 #include "ui/views/view.h"	15 #include "ui/views/view.h"

16 #include "ui/views/controls/label.h"	16 #include "ui/views/controls/label.h"

17 #include "ui/views/controls/link.h"	17 #include "ui/views/controls/link.h"

18 #include "ui/views/controls/link_listener.h"	18 #include "ui/views/controls/link_listener.h"

19 #include "ui/views/layout/box_layout.h"	19 #include "ui/views/layout/box_layout.h"

20	20

21 namespace ash {	21 namespace ash {

22 namespace internal {	22 namespace internal {

(...skipping 116 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 from_locale_ = from_locale;	139 from_locale_ = from_locale;

140 to_locale_ = to_locale;	140 to_locale_ = to_locale;

141 if (notification_)	141 if (notification_)

142 notification_->Update(delegate, cur_locale_, from_locale_, to_locale_);	142 notification_->Update(delegate, cur_locale_, from_locale_, to_locale_);

143 else	143 else

144 ShowNotificationView();	144 ShowNotificationView();

145 }	145 }

146	146

147 } // namespace internal	147 } // namespace internal

148 } // namespace ash	148 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/network/tray_network.cc » ('j') | chrome/browser/resources_util.cc » ('J')