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

Side by Side Diff: chrome/browser/ui/views/frame/browser_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 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 91 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
92 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" 92 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
93 #include "chrome/browser/ui/views/update_recommended_message_box.h" 93 #include "chrome/browser/ui/views/update_recommended_message_box.h"
94 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" 94 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
95 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 95 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
96 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 96 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
97 #include "chrome/browser/ui/window_sizer/window_sizer.h" 97 #include "chrome/browser/ui/window_sizer/window_sizer.h"
98 #include "chrome/common/chrome_switches.h" 98 #include "chrome/common/chrome_switches.h"
99 #include "chrome/common/pref_names.h" 99 #include "chrome/common/pref_names.h"
100 #include "chrome/common/url_constants.h" 100 #include "chrome/common/url_constants.h"
101 #include "chrome/grit/chromium_strings.h"
102 #include "chrome/grit/generated_resources.h"
101 #include "components/password_manager/core/browser/password_manager.h" 103 #include "components/password_manager/core/browser/password_manager.h"
102 #include "components/signin/core/common/profile_management_switches.h" 104 #include "components/signin/core/common/profile_management_switches.h"
103 #include "components/translate/core/browser/language_state.h" 105 #include "components/translate/core/browser/language_state.h"
104 #include "content/app/resources/grit/content_resources.h" 106 #include "content/app/resources/grit/content_resources.h"
105 #include "content/public/browser/download_manager.h" 107 #include "content/public/browser/download_manager.h"
106 #include "content/public/browser/native_web_keyboard_event.h" 108 #include "content/public/browser/native_web_keyboard_event.h"
107 #include "content/public/browser/notification_service.h" 109 #include "content/public/browser/notification_service.h"
108 #include "content/public/browser/render_frame_host.h" 110 #include "content/public/browser/render_frame_host.h"
109 #include "content/public/browser/render_view_host.h" 111 #include "content/public/browser/render_view_host.h"
110 #include "content/public/browser/user_metrics.h" 112 #include "content/public/browser/user_metrics.h"
111 #include "content/public/browser/web_contents.h" 113 #include "content/public/browser/web_contents.h"
112 #include "content/public/common/content_switches.h" 114 #include "content/public/common/content_switches.h"
113 #include "grit/chromium_strings.h"
114 #include "grit/generated_resources.h"
115 #include "grit/locale_settings.h" 115 #include "grit/locale_settings.h"
116 #include "grit/theme_resources.h" 116 #include "grit/theme_resources.h"
117 #include "ui/accessibility/ax_view_state.h" 117 #include "ui/accessibility/ax_view_state.h"
118 #include "ui/aura/client/window_tree_client.h" 118 #include "ui/aura/client/window_tree_client.h"
119 #include "ui/aura/window.h" 119 #include "ui/aura/window.h"
120 #include "ui/aura/window_tree_host.h" 120 #include "ui/aura/window_tree_host.h"
121 #include "ui/base/accelerators/accelerator.h" 121 #include "ui/base/accelerators/accelerator.h"
122 #include "ui/base/hit_test.h" 122 #include "ui/base/hit_test.h"
123 #include "ui/base/l10n/l10n_util.h" 123 #include "ui/base/l10n/l10n_util.h"
124 #include "ui/base/resource/resource_bundle.h" 124 #include "ui/base/resource/resource_bundle.h"
(...skipping 2432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { 2557 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
2558 gfx::Point icon_bottom( 2558 gfx::Point icon_bottom(
2559 toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2559 toolbar_->location_bar()->GetLocationBarAnchorPoint());
2560 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); 2560 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
2561 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2561 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2562 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2562 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2563 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2563 top_arrow_height = infobar_top.y() - icon_bottom.y();
2564 } 2564 }
2565 return top_arrow_height; 2565 return top_arrow_height;
2566 } 2566 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/first_run_dialog.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698