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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 30 matching lines...) Expand all
41 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h" 41 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
42 #include "chrome/browser/ui/views/toolbar/back_button.h" 42 #include "chrome/browser/ui/views/toolbar/back_button.h"
43 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 43 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
44 #include "chrome/browser/ui/views/toolbar/home_button.h" 44 #include "chrome/browser/ui/views/toolbar/home_button.h"
45 #include "chrome/browser/ui/views/toolbar/reload_button.h" 45 #include "chrome/browser/ui/views/toolbar/reload_button.h"
46 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 46 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
47 #include "chrome/browser/ui/views/toolbar/wrench_menu.h" 47 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
48 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" 48 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
49 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
51 #include "chrome/grit/chromium_strings.h"
52 #include "chrome/grit/generated_resources.h"
51 #include "content/public/browser/browser_accessibility_state.h" 53 #include "content/public/browser/browser_accessibility_state.h"
52 #include "content/public/browser/notification_service.h" 54 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/render_view_host.h" 55 #include "content/public/browser/render_view_host.h"
54 #include "content/public/browser/user_metrics.h" 56 #include "content/public/browser/user_metrics.h"
55 #include "content/public/browser/web_contents.h" 57 #include "content/public/browser/web_contents.h"
56 #include "grit/chromium_strings.h"
57 #include "grit/generated_resources.h"
58 #include "grit/theme_resources.h" 58 #include "grit/theme_resources.h"
59 #include "ui/accessibility/ax_view_state.h" 59 #include "ui/accessibility/ax_view_state.h"
60 #include "ui/aura/window.h" 60 #include "ui/aura/window.h"
61 #include "ui/base/l10n/l10n_util.h" 61 #include "ui/base/l10n/l10n_util.h"
62 #include "ui/base/theme_provider.h" 62 #include "ui/base/theme_provider.h"
63 #include "ui/base/window_open_disposition.h" 63 #include "ui/base/window_open_disposition.h"
64 #include "ui/compositor/layer.h" 64 #include "ui/compositor/layer.h"
65 #include "ui/gfx/canvas.h" 65 #include "ui/gfx/canvas.h"
66 #include "ui/gfx/image/canvas_image_source.h" 66 #include "ui/gfx/image/canvas_image_source.h"
67 #include "ui/keyboard/keyboard_controller.h" 67 #include "ui/keyboard/keyboard_controller.h"
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 787
788 void ToolbarView::OnShowHomeButtonChanged() { 788 void ToolbarView::OnShowHomeButtonChanged() {
789 Layout(); 789 Layout();
790 SchedulePaint(); 790 SchedulePaint();
791 } 791 }
792 792
793 int ToolbarView::content_shadow_height() const { 793 int ToolbarView::content_shadow_height() const {
794 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? 794 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
795 kContentShadowHeightAsh : kContentShadowHeight; 795 kContentShadowHeightAsh : kContentShadowHeight;
796 } 796 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/reload_button.cc ('k') | chrome/browser/ui/views/toolbar/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698