OLD | NEW |
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 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #import "base/mac/mac_util.h" | 9 #import "base/mac/mac_util.h" |
10 #include "base/message_loop/message_loop.h" | |
11 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
12 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
13 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
14 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/threading/thread_task_runner_handle.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #import "chrome/browser/app_controller_mac.h" | 16 #import "chrome/browser/app_controller_mac.h" |
17 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
18 #include "chrome/browser/defaults.h" | 18 #include "chrome/browser/defaults.h" |
19 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 19 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
20 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 20 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
21 #include "chrome/browser/extensions/extension_action.h" | 21 #include "chrome/browser/extensions/extension_action.h" |
22 #include "chrome/browser/extensions/location_bar_controller.h" | 22 #include "chrome/browser/extensions/location_bar_controller.h" |
23 #include "chrome/browser/extensions/tab_helper.h" | 23 #include "chrome/browser/extensions/tab_helper.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 // Disconnect from cell in case it outlives us. | 320 // Disconnect from cell in case it outlives us. |
321 [[field_ cell] clearDecorations]; | 321 [[field_ cell] clearDecorations]; |
322 | 322 |
323 zoom::ZoomEventManager::GetForBrowserContext(profile()) | 323 zoom::ZoomEventManager::GetForBrowserContext(profile()) |
324 ->RemoveZoomEventManagerObserver(this); | 324 ->RemoveZoomEventManagerObserver(this); |
325 } | 325 } |
326 | 326 |
327 void LocationBarViewMac::ShowFirstRunBubble() { | 327 void LocationBarViewMac::ShowFirstRunBubble() { |
328 // We need the browser window to be shown before we can show the bubble, but | 328 // We need the browser window to be shown before we can show the bubble, but |
329 // we get called before that's happened. | 329 // we get called before that's happened. |
330 base::MessageLoop::current()->PostTask( | 330 base::ThreadTaskRunnerHandle::Get()->PostTask( |
331 FROM_HERE, base::Bind(&LocationBarViewMac::ShowFirstRunBubbleInternal, | 331 FROM_HERE, base::Bind(&LocationBarViewMac::ShowFirstRunBubbleInternal, |
332 weak_ptr_factory_.GetWeakPtr())); | 332 weak_ptr_factory_.GetWeakPtr())); |
333 } | 333 } |
334 | 334 |
335 GURL LocationBarViewMac::GetDestinationURL() const { | 335 GURL LocationBarViewMac::GetDestinationURL() const { |
336 return destination_url(); | 336 return destination_url(); |
337 } | 337 } |
338 | 338 |
339 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { | 339 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { |
340 return disposition(); | 340 return disposition(); |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1024 OnDecorationsChanged(); | 1024 OnDecorationsChanged(); |
1025 } | 1025 } |
1026 | 1026 |
1027 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { | 1027 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { |
1028 std::vector<LocationBarDecoration*> decorations = GetDecorations(); | 1028 std::vector<LocationBarDecoration*> decorations = GetDecorations(); |
1029 std::vector<NSView*> views; | 1029 std::vector<NSView*> views; |
1030 for (const auto& decoration : decorations) | 1030 for (const auto& decoration : decorations) |
1031 views.push_back(decoration->GetAccessibilityView()); | 1031 views.push_back(decoration->GetAccessibilityView()); |
1032 return views; | 1032 return views; |
1033 } | 1033 } |
OLD | NEW |