chrome/browser/ui/views/location_bar/zoom_bubble_view.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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 | « chrome/browser/ui/views/location_bar/translate_icon_view.cc ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »

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 "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"	5 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"

6	6

7 #include "base/i18n/rtl.h"	7 #include "base/i18n/rtl.h"

8 #include "base/strings/stringprintf.h"	8 #include "base/strings/stringprintf.h"

9 #include "chrome/browser/chrome_notification_types.h"	9 #include "chrome/browser/chrome_notification_types.h"

10 #include "chrome/browser/chrome_page_zoom.h"	10 #include "chrome/browser/chrome_page_zoom.h"

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

12 #include "chrome/browser/ui/browser_finder.h"	12 #include "chrome/browser/ui/browser_finder.h"

13 #include "chrome/browser/ui/browser_tabstrip.h"	13 #include "chrome/browser/ui/browser_tabstrip.h"

14 #include "chrome/browser/ui/browser_window.h"	14 #include "chrome/browser/ui/browser_window.h"

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

16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

17 #include "chrome/browser/ui/views/location_bar/zoom_view.h"	17 #include "chrome/browser/ui/views/location_bar/zoom_view.h"

18 #include "chrome/browser/ui/zoom/zoom_controller.h"	18 #include "chrome/browser/ui/zoom/zoom_controller.h"

19 #include "chrome/common/extensions/api/extension_action/action_info.h"	19 #include "chrome/common/extensions/api/extension_action/action_info.h"

	20 #include "chrome/grit/generated_resources.h"

20 #include "content/public/browser/notification_source.h"	21 #include "content/public/browser/notification_source.h"

21 #include "extensions/common/manifest_handlers/icons_handler.h"	22 #include "extensions/common/manifest_handlers/icons_handler.h"

22 #include "grit/generated_resources.h"

23 #include "grit/theme_resources.h"	23 #include "grit/theme_resources.h"

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

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

26 #include "ui/gfx/favicon_size.h"	26 #include "ui/gfx/favicon_size.h"

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

28 #include "ui/views/controls/button/label_button.h"	28 #include "ui/views/controls/button/label_button.h"

29 #include "ui/views/controls/separator.h"	29 #include "ui/views/controls/separator.h"

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

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

32 #include "ui/views/widget/widget.h"	32 #include "ui/views/widget/widget.h"

(...skipping 319 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
352 void ZoomBubbleView::WindowClosing() {	352 void ZoomBubbleView::WindowClosing() {

353 // \|zoom_bubble_\| can be a new bubble by this point (as Close(); doesn't	353 // \|zoom_bubble_\| can be a new bubble by this point (as Close(); doesn't

354 // call this right away). Only set to NULL when it's this bubble.	354 // call this right away). Only set to NULL when it's this bubble.

355 if (zoom_bubble_ == this)	355 if (zoom_bubble_ == this)

356 zoom_bubble_ = NULL;	356 zoom_bubble_ = NULL;

357 }	357 }

358	358

359 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {}	359 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {}

360	360

361 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {}	361 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {}

OLD	NEW