Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window.cc

Issue 7015051: Re-land: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/chromeos/input_method/candidate_window.h" 5 #include "chrome/browser/chromeos/input_method/candidate_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 &CandidateWindowController::Impl::OnConnectionChange); 1274 &CandidateWindowController::Impl::OnConnectionChange);
1275 1275
1276 // Create the candidate window view. 1276 // Create the candidate window view.
1277 CreateView(); 1277 CreateView();
1278 1278
1279 return true; 1279 return true;
1280 } 1280 }
1281 1281
1282 void CandidateWindowController::Impl::CreateView() { 1282 void CandidateWindowController::Impl::CreateView() {
1283 // Create a non-decorated frame. 1283 // Create a non-decorated frame.
1284 frame_.reset(views::Widget::CreateWidget()); 1284 frame_.reset(new views::Widget);
1285 // The size is initially zero. 1285 // The size is initially zero.
1286 frame_->Init( 1286 frame_->Init(
1287 views::Widget::InitParams(views::Widget::InitParams::TYPE_POPUP)); 1287 views::Widget::InitParams(views::Widget::InitParams::TYPE_POPUP));
1288 1288
1289 // Create the candidate window. 1289 // Create the candidate window.
1290 candidate_window_ = new CandidateWindowView(frame_.get()); 1290 candidate_window_ = new CandidateWindowView(frame_.get());
1291 candidate_window_->Init(); 1291 candidate_window_->Init();
1292 candidate_window_->AddObserver(this); 1292 candidate_window_->AddObserver(this);
1293 1293
1294 // Put the candidate window view on the frame. The frame is resized 1294 // Put the candidate window view on the frame. The frame is resized
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 1408
1409 CandidateWindowController::~CandidateWindowController() { 1409 CandidateWindowController::~CandidateWindowController() {
1410 delete impl_; 1410 delete impl_;
1411 } 1411 }
1412 1412
1413 bool CandidateWindowController::Init() { 1413 bool CandidateWindowController::Init() {
1414 return impl_->Init(); 1414 return impl_->Init();
1415 } 1415 }
1416 1416
1417 } // namespace chromeos 1417 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/panel_controller.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698