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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc » ('j') | chrome/browser/ui/views/toolbar/wrench_menu_observer.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/toolbar_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/i18n/number_formatting.h" 9 #include "base/i18n/number_formatting.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/command_updater.h" 14 #include "chrome/browser/command_updater.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/themes/theme_service.h" 16 #include "chrome/browser/themes/theme_service.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_command_controller.h" 18 #include "chrome/browser/ui/browser_command_controller.h"
19 #include "chrome/browser/ui/browser_commands.h" 19 #include "chrome/browser/ui/browser_commands.h"
20 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" 20 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
21 #include "chrome/browser/ui/browser_instant_controller.h" 21 #include "chrome/browser/ui/browser_instant_controller.h"
22 #include "chrome/browser/ui/browser_tabstrip.h" 22 #include "chrome/browser/ui/browser_tabstrip.h"
23 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
24 #include "chrome/browser/ui/global_error/global_error_service.h" 24 #include "chrome/browser/ui/global_error/global_error_service.h"
25 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 25 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
26 #include "chrome/browser/ui/omnibox/omnibox_view.h" 26 #include "chrome/browser/ui/omnibox/omnibox_view.h"
27 #include "chrome/browser/ui/tabs/tab_strip_model.h" 27 #include "chrome/browser/ui/tabs/tab_strip_model.h"
28 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 28 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
29 #include "chrome/browser/ui/view_ids.h" 29 #include "chrome/browser/ui/view_ids.h"
30 #include "chrome/browser/ui/views/browser_actions_container.h"
31 #include "chrome/browser/ui/views/frame/browser_view.h" 30 #include "chrome/browser/ui/views/frame/browser_view.h"
32 #include "chrome/browser/ui/views/home_button.h"
33 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" 31 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
34 #include "chrome/browser/ui/views/location_bar/star_view.h" 32 #include "chrome/browser/ui/views/location_bar/star_view.h"
35 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" 33 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
36 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h" 34 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
37 #include "chrome/browser/ui/views/wrench_menu.h" 35 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
38 #include "chrome/browser/ui/views/wrench_toolbar_button.h" 36 #include "chrome/browser/ui/views/toolbar/home_button.h"
37 #include "chrome/browser/ui/views/toolbar/reload_button.h"
38 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
39 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
39 #include "chrome/browser/upgrade_detector.h" 40 #include "chrome/browser/upgrade_detector.h"
40 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
42 #include "content/public/browser/browser_accessibility_state.h" 43 #include "content/public/browser/browser_accessibility_state.h"
43 #include "content/public/browser/notification_service.h" 44 #include "content/public/browser/notification_service.h"
44 #include "content/public/browser/render_view_host.h" 45 #include "content/public/browser/render_view_host.h"
45 #include "content/public/browser/user_metrics.h" 46 #include "content/public/browser/user_metrics.h"
46 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
47 #include "content/public/browser/web_contents_view.h" 48 #include "content/public/browser/web_contents_view.h"
48 #include "grit/chromium_strings.h" 49 #include "grit/chromium_strings.h"
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 803
803 void ToolbarView::OnShowHomeButtonChanged() { 804 void ToolbarView::OnShowHomeButtonChanged() {
804 Layout(); 805 Layout();
805 SchedulePaint(); 806 SchedulePaint();
806 } 807 }
807 808
808 int ToolbarView::content_shadow_height() const { 809 int ToolbarView::content_shadow_height() const {
809 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? 810 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
810 kContentShadowHeightAsh : kContentShadowHeight; 811 kContentShadowHeightAsh : kContentShadowHeight;
811 } 812 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc » ('j') | chrome/browser/ui/views/toolbar/wrench_menu_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698