chrome/browser/ui/views/toolbar_view.cc - Issue 10700027: browser: Move global error to subdir.

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

Issue 10700027: browser: Move global error to subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

« no previous file with comments | « chrome/browser/ui/views/global_error_bubble_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

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

10 #include "chrome/browser/command_updater.h"	10 #include "chrome/browser/command_updater.h"

11 #include "chrome/browser/event_disposition.h"	11 #include "chrome/browser/event_disposition.h"

12 #include "chrome/browser/prefs/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

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

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

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

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

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

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

19 #include "chrome/browser/ui/browser_window.h"	19 #include "chrome/browser/ui/browser_window.h"

20 #include "chrome/browser/ui/global_error_service.h"	20 #include "chrome/browser/ui/global_error/global_error_service.h"

21 #include "chrome/browser/ui/global_error_service_factory.h"	21 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

22 #include "chrome/browser/ui/omnibox/omnibox_view.h"	22 #include "chrome/browser/ui/omnibox/omnibox_view.h"

23 #include "chrome/browser/ui/search/search.h"	23 #include "chrome/browser/ui/search/search.h"

24 #include "chrome/browser/ui/search/search_model.h"	24 #include "chrome/browser/ui/search/search_model.h"

25 #include "chrome/browser/ui/search/search_tab_helper.h"	25 #include "chrome/browser/ui/search/search_tab_helper.h"

26 #include "chrome/browser/ui/search/search_types.h"	26 #include "chrome/browser/ui/search/search_types.h"

27 #include "chrome/browser/ui/search/search_ui.h"	27 #include "chrome/browser/ui/search/search_ui.h"

28 #include "chrome/browser/ui/tab_contents/tab_contents.h"	28 #include "chrome/browser/ui/tab_contents/tab_contents.h"

29 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	29 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

30 #include "chrome/browser/ui/view_ids.h"	30 #include "chrome/browser/ui/view_ids.h"

31 #include "chrome/browser/ui/views/browser_actions_container.h"	31 #include "chrome/browser/ui/views/browser_actions_container.h"

(...skipping 966 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
998 // LocationBarContainer is not a child of the ToolbarView.	998 // LocationBarContainer is not a child of the ToolbarView.

999 gfx::Point origin(bounds.origin());	999 gfx::Point origin(bounds.origin());

1000 views::View::ConvertPointToView(this, location_bar_container_->parent(),	1000 views::View::ConvertPointToView(this, location_bar_container_->parent(),

1001 &origin);	1001 &origin);

1002 gfx::Rect target_bounds(origin, bounds.size());	1002 gfx::Rect target_bounds(origin, bounds.size());

1003 if (location_bar_container_->GetTargetBounds() != target_bounds) {	1003 if (location_bar_container_->GetTargetBounds() != target_bounds) {

1004 location_bar_container_->SetInToolbar(true);	1004 location_bar_container_->SetInToolbar(true);

1005 location_bar_container_->SetBoundsRect(target_bounds);	1005 location_bar_container_->SetBoundsRect(target_bounds);

1006 }	1006 }

1007 }	1007 }

OLD	NEW