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

Side by Side Diff: chrome/browser/ui/ime/ime_window.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_UI_IME_IME_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_IME_IME_WINDOW_H_
6 #define CHROME_BROWSER_UI_IME_IME_WINDOW_H_ 6 #define CHROME_BROWSER_UI_IME_IME_WINDOW_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/memory/scoped_ptr.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
14 #include "content/public/browser/web_contents_delegate.h" 14 #include "content/public/browser/web_contents_delegate.h"
15 #include "content/public/browser/web_contents_observer.h" 15 #include "content/public/browser/web_contents_observer.h"
16 #include "extensions/browser/extension_icon_image.h" 16 #include "extensions/browser/extension_icon_image.h"
17 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 #include "ui/views/widget/widget_delegate.h" 19 #include "ui/views/widget/widget_delegate.h"
20 #include "ui/views/widget/widget_observer.h" 20 #include "ui/views/widget/widget_observer.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // The mode of this IME window which is either normal or follow-cursor. 126 // The mode of this IME window which is either normal or follow-cursor.
127 // The follow-cursor window has the non client view on the left instead 127 // The follow-cursor window has the non client view on the left instead
128 // of top, and its position can auto-change according to the text cursor 128 // of top, and its position can auto-change according to the text cursor
129 // or composition. 129 // or composition.
130 Mode mode_; 130 Mode mode_;
131 131
132 // The window title which is shown in the non client view. 132 // The window title which is shown in the non client view.
133 std::string title_; 133 std::string title_;
134 134
135 // The window icon which is shown in the non client view. 135 // The window icon which is shown in the non client view.
136 scoped_ptr<extensions::IconImage> icon_; 136 std::unique_ptr<extensions::IconImage> icon_;
137 137
138 // The web contents for the IME window page web UI. 138 // The web contents for the IME window page web UI.
139 scoped_ptr<content::WebContents> web_contents_; 139 std::unique_ptr<content::WebContents> web_contents_;
140 140
141 ImeNativeWindow* native_window_; // Weak, it does self-destruction. 141 ImeNativeWindow* native_window_; // Weak, it does self-destruction.
142 142
143 base::ObserverList<ImeWindowObserver> observers_; 143 base::ObserverList<ImeWindowObserver> observers_;
144 144
145 DISALLOW_COPY_AND_ASSIGN(ImeWindow); 145 DISALLOW_COPY_AND_ASSIGN(ImeWindow);
146 }; 146 };
147 147
148 } // namespace ui 148 } // namespace ui
149 149
150 #endif // CHROME_BROWSER_UI_IME_IME_WINDOW_H_ 150 #endif // CHROME_BROWSER_UI_IME_IME_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/hung_plugin_tab_helper.cc ('k') | chrome/browser/ui/input_method/input_method_engine_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698