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

Side by Side Diff: chrome/browser/ui/views/frame/browser_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: 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
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/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 76 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
77 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 77 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
78 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 78 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
79 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" 79 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
80 #include "chrome/browser/ui/views/password_generation_bubble_view.h" 80 #include "chrome/browser/ui/views/password_generation_bubble_view.h"
81 #include "chrome/browser/ui/views/profile_chooser_view.h" 81 #include "chrome/browser/ui/views/profile_chooser_view.h"
82 #include "chrome/browser/ui/views/status_bubble_views.h" 82 #include "chrome/browser/ui/views/status_bubble_views.h"
83 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 83 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
84 #include "chrome/browser/ui/views/tabs/tab.h" 84 #include "chrome/browser/ui/views/tabs/tab.h"
85 #include "chrome/browser/ui/views/tabs/tab_strip.h" 85 #include "chrome/browser/ui/views/tabs/tab_strip.h"
86 #include "chrome/browser/ui/views/toolbar_view.h" 86 #include "chrome/browser/ui/views/toolbar/reload_button.h"
87 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
87 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" 88 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
88 #include "chrome/browser/ui/views/update_recommended_message_box.h" 89 #include "chrome/browser/ui/views/update_recommended_message_box.h"
89 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 90 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
90 #include "chrome/browser/ui/window_sizer/window_sizer.h" 91 #include "chrome/browser/ui/window_sizer/window_sizer.h"
91 #include "chrome/common/chrome_switches.h" 92 #include "chrome/common/chrome_switches.h"
92 #include "chrome/common/pref_names.h" 93 #include "chrome/common/pref_names.h"
93 #include "chrome/common/url_constants.h" 94 #include "chrome/common/url_constants.h"
94 #include "content/public/browser/download_manager.h" 95 #include "content/public/browser/download_manager.h"
95 #include "content/public/browser/native_web_keyboard_event.h" 96 #include "content/public/browser/native_web_keyboard_event.h"
96 #include "content/public/browser/notification_service.h" 97 #include "content/public/browser/notification_service.h"
(...skipping 2598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 !GetLocationBar()->GetLocationEntry()->model()->popup_model()->IsOpen()) { 2696 !GetLocationBar()->GetLocationEntry()->model()->popup_model()->IsOpen()) {
2696 gfx::Point icon_bottom( 2697 gfx::Point icon_bottom(
2697 toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2698 toolbar_->location_bar()->GetLocationBarAnchorPoint());
2698 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); 2699 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
2699 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2700 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2700 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2701 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2701 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2702 top_arrow_height = infobar_top.y() - icon_bottom.y();
2702 } 2703 }
2703 return top_arrow_height; 2704 return top_arrow_height;
2704 } 2705 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698