| 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 "ui/oak/oak_aura_window_display.h" | 5 #include "ui/oak/oak_aura_window_display.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 ROW_CANFOCUS, | 36 ROW_CANFOCUS, |
| 37 ROW_HITTESTBOUNDSOVERRIDEOUTER, | 37 ROW_HITTESTBOUNDSOVERRIDEOUTER, |
| 38 ROW_HITTESTBOUNDSOVERRIDEINNER, | 38 ROW_HITTESTBOUNDSOVERRIDEINNER, |
| 39 ROW_COUNT | 39 ROW_COUNT |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 // aura::Window-specific pretty printing. | 42 // aura::Window-specific pretty printing. |
| 43 base::string16 PropertyWithWindowType(int type) { | 43 base::string16 PropertyWithWindowType(int type) { |
| 44 std::string property = "Type: "; | 44 std::string property = "Type: "; |
| 45 switch (type) { | 45 switch (type) { |
| 46 case aura::client::WINDOW_TYPE_UNKNOWN: | 46 case ui::wm::WINDOW_TYPE_UNKNOWN: |
| 47 property.append("WINDOW_TYPE_UNKNOWN"); | 47 property.append("WINDOW_TYPE_UNKNOWN"); |
| 48 break; | 48 break; |
| 49 case aura::client::WINDOW_TYPE_NORMAL: | 49 case ui::wm::WINDOW_TYPE_NORMAL: |
| 50 property.append("WINDOW_TYPE_NORMAL"); | 50 property.append("WINDOW_TYPE_NORMAL"); |
| 51 break; | 51 break; |
| 52 case aura::client::WINDOW_TYPE_POPUP: | 52 case ui::wm::WINDOW_TYPE_POPUP: |
| 53 property.append("WINDOW_TYPE_POPUP"); | 53 property.append("WINDOW_TYPE_POPUP"); |
| 54 break; | 54 break; |
| 55 case aura::client::WINDOW_TYPE_CONTROL: | 55 case ui::wm::WINDOW_TYPE_CONTROL: |
| 56 property.append("WINDOW_TYPE_CONTROL"); | 56 property.append("WINDOW_TYPE_CONTROL"); |
| 57 break; | 57 break; |
| 58 case aura::client::WINDOW_TYPE_PANEL: | 58 case ui::wm::WINDOW_TYPE_PANEL: |
| 59 property.append("WINDOW_TYPE_PANEL"); | 59 property.append("WINDOW_TYPE_PANEL"); |
| 60 break; | 60 break; |
| 61 case aura::client::WINDOW_TYPE_MENU: | 61 case ui::wm::WINDOW_TYPE_MENU: |
| 62 property.append("WINDOW_TYPE_MENU"); | 62 property.append("WINDOW_TYPE_MENU"); |
| 63 break; | 63 break; |
| 64 case aura::client::WINDOW_TYPE_TOOLTIP: | 64 case ui::wm::WINDOW_TYPE_TOOLTIP: |
| 65 property.append("WINDOW_TYPE_TOOLTIP"); | 65 property.append("WINDOW_TYPE_TOOLTIP"); |
| 66 break; | 66 break; |
| 67 default: | 67 default: |
| 68 NOTREACHED(); | 68 NOTREACHED(); |
| 69 break; | 69 break; |
| 70 } | 70 } |
| 71 return ASCIIToUTF16(property); | 71 return ASCIIToUTF16(property); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace | 74 } // namespace |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 155 } |
| 156 return base::string16(); | 156 return base::string16(); |
| 157 } | 157 } |
| 158 | 158 |
| 159 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) { | 159 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) { |
| 160 observer_ = observer; | 160 observer_ = observer; |
| 161 } | 161 } |
| 162 | 162 |
| 163 } // namespace internal | 163 } // namespace internal |
| 164 } // namespace oak | 164 } // namespace oak |
| OLD | NEW |