chrome/browser/ui/views/extensions/bundle_installed_bubble.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: chrome/browser/ui/views/extensions/bundle_installed_bubble.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: rebase, *_standard.rc 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 "base/i18n/rtl.h"	5 #include "base/i18n/rtl.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

7 #include "chrome/browser/extensions/bundle_installer.h"	7 #include "chrome/browser/extensions/bundle_installer.h"

8 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.h"

9 #include "chrome/browser/ui/views/frame/browser_view.h"	9 #include "chrome/browser/ui/views/frame/browser_view.h"

10 #include "chrome/browser/ui/views/toolbar_view.h"	10 #include "chrome/browser/ui/views/toolbar_view.h"

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

12 #include "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

13 #include "grit/theme_resources_standard.h"	13 #include "grit/theme_resources.h"

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

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

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

17 #include "ui/views/bubble/bubble_delegate.h"	17 #include "ui/views/bubble/bubble_delegate.h"

18 #include "ui/views/controls/button/image_button.h"	18 #include "ui/views/controls/button/image_button.h"

19 #include "ui/views/controls/image_view.h"	19 #include "ui/views/controls/image_view.h"

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

21 #include "ui/views/layout/grid_layout.h"	21 #include "ui/views/layout/grid_layout.h"

22 #include "ui/views/layout/layout_constants.h"	22 #include "ui/views/layout/layout_constants.h"

23	23

24 using extensions::BundleInstaller;	24 using extensions::BundleInstaller;

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 };	160 };

161	161

162 } // namespace	162 } // namespace

163	163

164 void BundleInstaller::ShowInstalledBubble(	164 void BundleInstaller::ShowInstalledBubble(

165 const BundleInstaller* bundle, Browser* browser) {	165 const BundleInstaller* bundle, Browser* browser) {

166 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);	166 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);

167 views::View* anchor = browser_view->GetToolbarView()->app_menu();	167 views::View* anchor = browser_view->GetToolbarView()->app_menu();

168 new BundleInstalledBubble(bundle, anchor, views::BubbleBorder::TOP_RIGHT);	168 new BundleInstalledBubble(bundle, anchor, views::BubbleBorder::TOP_RIGHT);

169 }	169 }

OLD	NEW