Tweaks to get views compiling with mojo

ui/views/layout/grid_layout.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/layout/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 410 matching lines @@
                           int min_width,
                           bool is_padding) {
   Column* column = new Column(h_align, v_align, resize_percent, size_type,
                               fixed_width, min_width, columns_.size(),
                               is_padding);
   columns_.push_back(column);
 }
 
 void ColumnSet::AddViewState(ViewState* view_state) {
   // view_states are ordered by column_span (in ascending order).
-  std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(),
-                                                    view_states_.end(),
-                                                    view_state,
-                                                    CompareByColumnSpan);
+  std::vector<ViewState*>::iterator i = std::lower_bound(view_states_.begin(),
+                                                         view_states_.end(),
+                                                         view_state,
+                                                         CompareByColumnSpan);
   view_states_.insert(i, view_state);
 }
 
 void ColumnSet::CalculateMasterColumns() {
   for (std::vector<Column*>::iterator i = columns_.begin();
        i != columns_.end(); ++i) {
     Column* column = *i;
     int same_size_column_index = column->same_size_column_;
     if (same_size_column_index != -1) {
       DCHECK(same_size_column_index >= 0 &&
@@ skipping 51 matching lines @@
   AccumulateMasterColumns();
 }
 
 void ColumnSet::AccumulateMasterColumns() {
   DCHECK(master_columns_.empty());
   for (std::vector<Column*>::iterator i = columns_.begin();
        i != columns_.end(); ++i) {
     Column* column = *i;
     Column* master_column = column->GetLastMasterColumn();
     if (master_column &&
-        find(master_columns_.begin(), master_columns_.end(),
-             master_column) == master_columns_.end()) {
+        std::find(master_columns_.begin(), master_columns_.end(),
+                  master_column) == master_columns_.end()) {
       master_columns_.push_back(master_column);
     }
     // At this point, GetLastMasterColumn may not == master_column
     // (may have to go through a few Columns)_. Reset master_column to
     // avoid hops.
     column->master_column_ = master_column;
   }
 }
 
 void ColumnSet::UnifySameSizedColumnSizes() {
@@ skipping 455 matching lines @@
                               view_state->view->parent() == host_));
   if (!view_state->view->parent()) {
     adding_view_ = true;
     host_->AddChildView(view_state->view);
     adding_view_ = false;
   }
   remaining_row_span_ = std::max(remaining_row_span_, view_state->row_span);
   next_column_ += view_state->col_span;
   current_row_col_set_->AddViewState(view_state);
   // view_states are ordered by row_span (in ascending order).
-  std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(),
-                                                    view_states_.end(),
-                                                    view_state,
-                                                    CompareByRowSpan);
+  std::vector<ViewState*>::iterator i = std::lower_bound(view_states_.begin(),
+                                                         view_states_.end(),
+                                                         view_state,
+                                                         CompareByRowSpan);
   view_states_.insert(i, view_state);
   SkipPaddingColumns();
 }
 
 void GridLayout::AddRow(Row* row) {
   current_row_++;
   remaining_row_span_--;
   // GridLayout requires that if you add a View with a row span you use the same
   // column set for each of the rows the view lands it. This DCHECK verifies
   // that.
@@ skipping 66 matching lines @@
 
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return NULL;
 }
 
 }  // namespace views