OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "grit/webkit_resources.h" | 76 #include "grit/webkit_resources.h" |
77 #include "views/controls/single_split_view.h" | 77 #include "views/controls/single_split_view.h" |
78 #include "views/focus/external_focus_tracker.h" | 78 #include "views/focus/external_focus_tracker.h" |
79 #include "views/focus/view_storage.h" | 79 #include "views/focus/view_storage.h" |
80 #include "views/grid_layout.h" | 80 #include "views/grid_layout.h" |
81 #include "views/widget/root_view.h" | 81 #include "views/widget/root_view.h" |
82 #include "views/window/dialog_delegate.h" | 82 #include "views/window/dialog_delegate.h" |
83 #include "views/window/window.h" | 83 #include "views/window/window.h" |
84 | 84 |
85 #if defined(OS_WIN) | 85 #if defined(OS_WIN) |
86 #include "app/view_prop.h" | |
87 #include "app/win/win_util.h" | 86 #include "app/win/win_util.h" |
88 #include "chrome/browser/aeropeek_manager.h" | 87 #include "chrome/browser/aeropeek_manager.h" |
89 #include "chrome/browser/jumplist_win.h" | 88 #include "chrome/browser/jumplist_win.h" |
| 89 #include "ui/base/view_prop.h" |
90 #elif defined(OS_LINUX) | 90 #elif defined(OS_LINUX) |
91 #include "chrome/browser/ui/views/accelerator_table_gtk.h" | 91 #include "chrome/browser/ui/views/accelerator_table_gtk.h" |
92 #include "views/window/hit_test.h" | 92 #include "views/window/hit_test.h" |
93 #include "views/window/window_gtk.h" | 93 #include "views/window/window_gtk.h" |
94 #endif | 94 #endif |
95 | 95 |
96 #if defined(OS_CHROMEOS) | 96 #if defined(OS_CHROMEOS) |
97 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" | 97 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" |
98 #endif | 98 #endif |
99 | 99 |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 // Explicitly set browser_ to NULL. | 483 // Explicitly set browser_ to NULL. |
484 browser_.reset(); | 484 browser_.reset(); |
485 } | 485 } |
486 | 486 |
487 // static | 487 // static |
488 BrowserView* BrowserView::GetBrowserViewForNativeWindow( | 488 BrowserView* BrowserView::GetBrowserViewForNativeWindow( |
489 gfx::NativeWindow window) { | 489 gfx::NativeWindow window) { |
490 #if defined(OS_WIN) | 490 #if defined(OS_WIN) |
491 if (IsWindow(window)) { | 491 if (IsWindow(window)) { |
492 return reinterpret_cast<BrowserView*>( | 492 return reinterpret_cast<BrowserView*>( |
493 app::ViewProp::GetValue(window, kBrowserViewKey)); | 493 ui::ViewProp::GetValue(window, kBrowserViewKey)); |
494 } | 494 } |
495 #else | 495 #else |
496 if (window) { | 496 if (window) { |
497 return static_cast<BrowserView*>( | 497 return static_cast<BrowserView*>( |
498 g_object_get_data(G_OBJECT(window), kBrowserViewKey)); | 498 g_object_get_data(G_OBJECT(window), kBrowserViewKey)); |
499 } | 499 } |
500 #endif | 500 #endif |
501 return NULL; | 501 return NULL; |
502 } | 502 } |
503 | 503 |
(...skipping 2049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2553 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2553 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
2554 | 2554 |
2555 return view; | 2555 return view; |
2556 } | 2556 } |
2557 #endif | 2557 #endif |
2558 | 2558 |
2559 // static | 2559 // static |
2560 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2560 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2561 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2561 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2562 } | 2562 } |
OLD | NEW |