| 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 #import <Cocoa/Cocoa.h> |    5 #import <Cocoa/Cocoa.h> | 
|    6  |    6  | 
|    7 #import "base/mac/scoped_nsobject.h" |    7 #import "base/mac/scoped_nsobject.h" | 
|    8 #include "base/strings/utf_string_conversions.h" |    8 #include "base/strings/utf_string_conversions.h" | 
|    9 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" |    9 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 
|   10 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h" |   10 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h" | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   68 - (void)commandDispatch:(TabStripModel::ContextMenuCommand)command |   68 - (void)commandDispatch:(TabStripModel::ContextMenuCommand)command | 
|   69           forController:(TabController*)controller { |   69           forController:(TabController*)controller { | 
|   70 } |   70 } | 
|   71 - (BOOL)isCommandEnabled:(TabStripModel::ContextMenuCommand)command |   71 - (BOOL)isCommandEnabled:(TabStripModel::ContextMenuCommand)command | 
|   72            forController:(TabController*)controller { |   72            forController:(TabController*)controller { | 
|   73   return NO; |   73   return NO; | 
|   74 } |   74 } | 
|   75 - (ui::SimpleMenuModel*)contextMenuModelForController:(TabController*)controller |   75 - (ui::SimpleMenuModel*)contextMenuModelForController:(TabController*)controller | 
|   76     menuDelegate:(ui::SimpleMenuModel::Delegate*)delegate { |   76     menuDelegate:(ui::SimpleMenuModel::Delegate*)delegate { | 
|   77   ui::SimpleMenuModel* model = new ui::SimpleMenuModel(delegate); |   77   ui::SimpleMenuModel* model = new ui::SimpleMenuModel(delegate); | 
|   78   model->AddItem(1, ASCIIToUTF16("Hello World")); |   78   model->AddItem(1, base::ASCIIToUTF16("Hello World")); | 
|   79   model->AddItem(2, ASCIIToUTF16("Allays")); |   79   model->AddItem(2, base::ASCIIToUTF16("Allays")); | 
|   80   model->AddItem(3, ASCIIToUTF16("Chromium")); |   80   model->AddItem(3, base::ASCIIToUTF16("Chromium")); | 
|   81   return model; |   81   return model; | 
|   82 } |   82 } | 
|   83 - (id<TabDraggingEventTarget>)dragController { |   83 - (id<TabDraggingEventTarget>)dragController { | 
|   84   return dragController_.get(); |   84   return dragController_.get(); | 
|   85 } |   85 } | 
|   86 @end |   86 @end | 
|   87  |   87  | 
|   88 namespace { |   88 namespace { | 
|   89  |   89  | 
|   90 CGFloat LeftMargin(NSRect superFrame, NSRect subFrame) { |   90 CGFloat LeftMargin(NSRect superFrame, NSRect subFrame) { | 
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  542           [[controller view] setFrame:tabFrame]; |  542           [[controller view] setFrame:tabFrame]; | 
|  543           CheckForExpectedLayoutAndVisibilityOfSubviews(controller); |  543           CheckForExpectedLayoutAndVisibilityOfSubviews(controller); | 
|  544           --tabFrame.size.width; |  544           --tabFrame.size.width; | 
|  545         } |  545         } | 
|  546       } |  546       } | 
|  547     } |  547     } | 
|  548   } |  548   } | 
|  549 } |  549 } | 
|  550  |  550  | 
|  551 }  // namespace |  551 }  // namespace | 
| OLD | NEW |