chrome/browser/ui/views/toolbar_view.cc - Issue 19073003: Update some includes of chrome_notification_types.h

Side by Side Diff: chrome/browser/ui/views/toolbar_view.cc

Issue 19073003: Update some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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/toolbar_view.h"	5 #include "chrome/browser/ui/views/toolbar_view.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/debug/trace_event.h"

8 #include "base/i18n/number_formatting.h"	8 #include "base/i18n/number_formatting.h"

9 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

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

12 #include "chrome/browser/command_updater.h"	13 #include "chrome/browser/command_updater.h"

13 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/themes/theme_service.h"	15 #include "chrome/browser/themes/theme_service.h"

15 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/browser_command_controller.h"	17 #include "chrome/browser/ui/browser_command_controller.h"

17 #include "chrome/browser/ui/browser_commands.h"	18 #include "chrome/browser/ui/browser_commands.h"

18 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"	19 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"

19 #include "chrome/browser/ui/browser_instant_controller.h"	20 #include "chrome/browser/ui/browser_instant_controller.h"

20 #include "chrome/browser/ui/browser_tabstrip.h"	21 #include "chrome/browser/ui/browser_tabstrip.h"

21 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

22 #include "chrome/browser/ui/global_error/global_error_service.h"	23 #include "chrome/browser/ui/global_error/global_error_service.h"

23 #include "chrome/browser/ui/global_error/global_error_service_factory.h"	24 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

24 #include "chrome/browser/ui/omnibox/omnibox_view.h"	25 #include "chrome/browser/ui/omnibox/omnibox_view.h"

25 #include "chrome/browser/ui/tabs/tab_strip_model.h"	26 #include "chrome/browser/ui/tabs/tab_strip_model.h"

26 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	27 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

27 #include "chrome/browser/ui/view_ids.h"	28 #include "chrome/browser/ui/view_ids.h"

28 #include "chrome/browser/ui/views/browser_actions_container.h"	29 #include "chrome/browser/ui/views/browser_actions_container.h"

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

30 #include "chrome/browser/ui/views/home_button.h"	31 #include "chrome/browser/ui/views/home_button.h"

31 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"	32 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

32 #include "chrome/browser/ui/views/location_bar/star_view.h"	33 #include "chrome/browser/ui/views/location_bar/star_view.h"

33 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"	34 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"

34 #include "chrome/browser/ui/views/wrench_menu.h"	35 #include "chrome/browser/ui/views/wrench_menu.h"

35 #include "chrome/browser/ui/views/wrench_toolbar_button.h"	36 #include "chrome/browser/ui/views/wrench_toolbar_button.h"

36 #include "chrome/browser/upgrade_detector.h"	37 #include "chrome/browser/upgrade_detector.h"

37 #include "chrome/common/chrome_notification_types.h"

38 #include "chrome/common/pref_names.h"	38 #include "chrome/common/pref_names.h"

39 #include "content/public/browser/browser_accessibility_state.h"	39 #include "content/public/browser/browser_accessibility_state.h"

40 #include "content/public/browser/notification_service.h"	40 #include "content/public/browser/notification_service.h"

41 #include "content/public/browser/render_view_host.h"	41 #include "content/public/browser/render_view_host.h"

42 #include "content/public/browser/user_metrics.h"	42 #include "content/public/browser/user_metrics.h"

43 #include "content/public/browser/web_contents.h"	43 #include "content/public/browser/web_contents.h"

44 #include "content/public/browser/web_contents_view.h"	44 #include "content/public/browser/web_contents_view.h"

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

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

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

(...skipping 738 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
786	786

787 void ToolbarView::OnShowHomeButtonChanged() {	787 void ToolbarView::OnShowHomeButtonChanged() {

788 Layout();	788 Layout();

789 SchedulePaint();	789 SchedulePaint();

790 }	790 }

791	791

792 int ToolbarView::content_shadow_height() const {	792 int ToolbarView::content_shadow_height() const {

793 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?	793 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?

794 kContentShadowHeightAsh : kContentShadowHeight;	794 kContentShadowHeightAsh : kContentShadowHeight;

795 }	795 }

OLD	NEW