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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10534153: Use OmniboxViewViews on Win with --enable-views-textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ignore Patch Set 3; use static bool in UseOmniboxViews(). Created 8 years, 6 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 (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/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 19 matching lines...) Expand all
30 #include "chrome/browser/profiles/profile_info_cache.h" 30 #include "chrome/browser/profiles/profile_info_cache.h"
31 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/browser/sessions/tab_restore_service.h" 32 #include "chrome/browser/sessions/tab_restore_service.h"
33 #include "chrome/browser/sessions/tab_restore_service_factory.h" 33 #include "chrome/browser/sessions/tab_restore_service_factory.h"
34 #include "chrome/browser/speech/extension_api/tts_extension_api.h" 34 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
35 #include "chrome/browser/themes/theme_service.h" 35 #include "chrome/browser/themes/theme_service.h"
36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" 36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
37 #include "chrome/browser/ui/browser.h" 37 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_dialogs.h" 38 #include "chrome/browser/ui/browser_dialogs.h"
39 #include "chrome/browser/ui/browser_list.h" 39 #include "chrome/browser/ui/browser_list.h"
40 #include "chrome/browser/ui/omnibox/omnibox_view.h"
40 #include "chrome/browser/ui/tab_contents/tab_contents.h" 41 #include "chrome/browser/ui/tab_contents/tab_contents.h"
41 #include "chrome/browser/ui/tabs/tab_menu_model.h" 42 #include "chrome/browser/ui/tabs/tab_menu_model.h"
42 #include "chrome/browser/ui/tabs/tab_strip_model.h" 43 #include "chrome/browser/ui/tabs/tab_strip_model.h"
43 #include "chrome/browser/ui/view_ids.h" 44 #include "chrome/browser/ui/view_ids.h"
44 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" 45 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
45 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" 46 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
46 #include "chrome/browser/ui/views/avatar_menu_button.h" 47 #include "chrome/browser/ui/views/avatar_menu_button.h"
47 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 48 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
48 #include "chrome/browser/ui/views/browser_dialogs.h" 49 #include "chrome/browser/ui/views/browser_dialogs.h"
49 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" 50 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
50 #include "chrome/browser/ui/views/download/download_shelf_view.h" 51 #include "chrome/browser/ui/views/download/download_shelf_view.h"
51 #include "chrome/browser/ui/views/frame/browser_view_layout.h" 52 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
52 #include "chrome/browser/ui/views/frame/contents_container.h" 53 #include "chrome/browser/ui/views/frame/contents_container.h"
53 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" 54 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
54 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 55 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
55 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 56 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
57 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
56 #include "chrome/browser/ui/views/password_generation_bubble_view.h" 58 #include "chrome/browser/ui/views/password_generation_bubble_view.h"
57 #include "chrome/browser/ui/views/status_bubble_views.h" 59 #include "chrome/browser/ui/views/status_bubble_views.h"
58 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 60 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
59 #include "chrome/browser/ui/views/tabs/tab_strip.h" 61 #include "chrome/browser/ui/views/tabs/tab_strip.h"
60 #include "chrome/browser/ui/views/toolbar_view.h" 62 #include "chrome/browser/ui/views/toolbar_view.h"
61 #include "chrome/browser/ui/views/update_recommended_message_box.h" 63 #include "chrome/browser/ui/views/update_recommended_message_box.h"
62 #include "chrome/browser/ui/views/website_settings_popup_view.h" 64 #include "chrome/browser/ui/views/website_settings_popup_view.h"
63 #include "chrome/browser/ui/webui/feedback_ui.h" 65 #include "chrome/browser/ui/webui/feedback_ui.h"
64 #include "chrome/browser/ui/window_sizer.h" 66 #include "chrome/browser/ui/window_sizer.h"
65 #include "chrome/common/chrome_notification_types.h" 67 #include "chrome/common/chrome_notification_types.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #if defined(USE_ASH) 107 #if defined(USE_ASH)
106 #include "ash/launcher/launcher.h" 108 #include "ash/launcher/launcher.h"
107 #include "ash/launcher/launcher_model.h" 109 #include "ash/launcher/launcher_model.h"
108 #include "ash/shell.h" 110 #include "ash/shell.h"
109 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 111 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
110 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h" 112 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"
111 #include "chrome/browser/ui/views/ash/window_positioner.h" 113 #include "chrome/browser/ui/views/ash/window_positioner.h"
112 #elif defined(OS_WIN) && !defined(USE_AURA) 114 #elif defined(OS_WIN) && !defined(USE_AURA)
113 #include "base/win/metro.h" 115 #include "base/win/metro.h"
114 #include "chrome/browser/jumplist_win.h" 116 #include "chrome/browser/jumplist_win.h"
117 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
115 #include "ui/views/widget/native_widget_win.h" 118 #include "ui/views/widget/native_widget_win.h"
116 #endif 119 #endif
117 120
118 #if defined(USE_AURA) 121 #if defined(USE_AURA)
119 #include "chrome/browser/ui/views/accelerator_table.h" 122 #include "chrome/browser/ui/views/accelerator_table.h"
123 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
120 #include "ui/gfx/screen.h" 124 #include "ui/gfx/screen.h"
121 #endif 125 #endif
122 126
123 #if defined(USE_AURA)
124 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
125 #endif
126
127 #if defined(ENABLE_ONE_CLICK_SIGNIN) 127 #if defined(ENABLE_ONE_CLICK_SIGNIN)
128 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" 128 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
129 #endif 129 #endif
130 130
131 using base::TimeDelta; 131 using base::TimeDelta;
132 using content::NativeWebKeyboardEvent; 132 using content::NativeWebKeyboardEvent;
133 using content::SSLStatus; 133 using content::SSLStatus;
134 using content::UserMetricsAction; 134 using content::UserMetricsAction;
135 using content::WebContents; 135 using content::WebContents;
136 using views::ColumnSet; 136 using views::ColumnSet;
(...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after
2447 this, 2447 this,
2448 tab_contents->web_contents()->GetRenderViewHost(), 2448 tab_contents->web_contents()->GetRenderViewHost(),
2449 password_generator, 2449 password_generator,
2450 browser_.get(), 2450 browser_.get(),
2451 tab_contents->password_manager()); 2451 tab_contents->password_manager());
2452 2452
2453 views::BubbleDelegateView::CreateBubble(bubble); 2453 views::BubbleDelegateView::CreateBubble(bubble);
2454 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); 2454 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
2455 bubble->Show(); 2455 bubble->Show();
2456 } 2456 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698